Code cleanup
Merge branch 'refactor'

Conflicts:
	app/assets/javascripts/views/tasks/tasks_view.js
	app/assets/templates/tasks/tasks_view.jst.ejs