let protractor run with default seleniumJar
Merge remote-tracking branch 'origin/simplify_protractor' into gulp

Conflicts:
	gulpfile.ls
	package.json
	package.ls