Working ont project task system
Merge remote-tracking branch 'origin/master' into task_tracker

* origin/master:
  Hiding some comments when there are deleted
  Adding delete/block/activate user status also comments migration
  Adding some master routes to make everything nicer for the masters
Finishing tasks
Merge remote-tracking branch 'origin/task_tracker' into socialcoffee

* origin/task_tracker:
  Finishing tasks
  Working ont project task system