Many many something
Merge remote-tracking branch 'origin/master'

Conflicts:
	Content/logs/2014-08-21/info.txt
	Controllers/UserTaskController.cs
	Views/UserTask/ViewTask.cshtml