Merge branch 'dev' of https://github.com/duejay/ngProtractor

Conflicts:
	.gitignore
	Gruntfile.js
	app/index.html
	app/js/controllers.js
	app/partials/best-players.html
	builds/buildng-prot-2014-07-10 8:33:01 AM.zip
	package.json
	test/e2e/scenarios.js
	test/unit/controllersSpec.js