conflict?
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/assets/css/site_default.css
	public/assets/js/angularjs/modules/tasks/controllers.js