get people the right way
Merge branch '11-notification_setup' into staging