updated angular version & new timepicker
Merge branch 'master' of github.com:godot/pasher

Conflicts:
	app/assets/javascripts/app.js