Update the task's dialog.
Merge branch 'master' of https://github.com/sharedCoop/share

Conflicts:
	app/scripts/controllers/task_dialog.js
	app/styles/task_dialog.css
	app/views/index.html
	app/views/partials/board.html
	app/views/partials/dialog_template.html