merging events from jetstrap in
Merge branch 'master' of https://github.com/OverlappingElvis/dressforsuccess
some (not so) advanced user management shizzy