Events and places
Merge branch 'master' of https://github.com/StrataLabs/nb_app