Merge branch 'development' into BugFix463

Conflicts:
	advanced/Scripts/blacklist.sh
	advanced/Scripts/whitelist.sh

advanced/Scripts/blacklist.sh

@@ -80,6 +80,10 @@ function helpFunc()
 	exit 1
 }
 
+if [[ $# = 0 ]]; then
+	helpFunc
+fi
+
 function HandleOther(){
   #check validity of domain
 	validDomain=$(echo "$1" | perl -ne'print if /\b((?=[a-z0-9-]{1,63}\.)(xn--)?[a-z0-9]+(-[a-z0-9]+)*\.)+[a-z]{2,63}\b/')