Merge branch 'master' into custom-error

Author: liorbentov

app/static/app/js/custom.js

@@ -21,7 +21,5 @@ function checkEmpty() {
 	if (input.value === "" || input.value === null) {
 		return false;
 	}
-	else {
-		return true;
-	}
+	return true;
 }