add active scope for registrations
fix join an event will set the existing registration to active
Merge commit 'd209abc77c88d4e02334da3f05474da35798e7b2'
moved analytics to partial
update models annotations
just added a permission to the download matches link
Merge branch 'master' of github.com:andrewhl/AdvancedStudyRoom
typo in controller
Merge branch 'master' of github.com:andrewhl/AdvancedStudyRoom into features/markitup