Rejected commit: Default
Rejected commit: Default
Rejected commit: Default
Merge remote-tracking branch 'origin/master'

Conflicts:
	partials/cms/task_edit.js
	partials/cms/task_list.js