adding fixes to start using .jshintrc
Merge remote-tracking branch 'origin/console-e2e-test' into console-e2e-test

Conflicts:
	.jshintrc