fix statsu 'waitting' -> 'wait'
Merge remote-tracking branch 'origin/master'

Conflicts:
	client/templates/task/taskManager.coffee