Fix karma config
Zooming
Merge remote-tracking branch 'origin/master'
Zooming
Fix karma config
Change jquery to angular
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/scripts/controllers/main.js
	app/views/main.html
Timer
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/scripts/controllers/main.js
Timer fix