Cli changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/groovy/com/soulsys/gserv/resourceloader/InstanceScriptException.groovy
	src/main/groovy/com/soulsys/gserv/resourceloader/ResourceScriptException.groovy
	src/main/groovy/com/soulsys/gserv/resourceloader/ScriptClasspathException.groovy
	src/test/groovy/com/soulsys/gserv/test/integration/BasicAuthSpec.groovy
	src/test/groovy/com/soulsys/gserv/test/integration/CliClasspathSpec.groovy
	src/test/groovy/com/soulsys/gserv/test/integration/ToUpperSpec.groovy
	src/test/resources/test/integration/basicauth/BasicAuth.groovy