Fixed sorting times
Fixed sorting times and added cancel on edit
Added cancel on edit, split actions
Fixed styles for times actions
Merge branch 'master' into requirejs

Conflicts:
	app/static/js/collections.min.js
	app/static/js/views.min.js