removed offending ')'!
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/scripts/modules/routeSecurity/module.routeSecurity.js
	app/scripts/modules/simpleLoginTools/module.simpleLoginTools.js