Complete staff + fix bug + messages
Merge remote-tracking branch 'origin/dev/master' into dev/gugger