Karma Testing now working
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/scripts/app.js