Merge branch 'feature/65-perms'
#152: Flip Events and Hours on homepage
Merge branch 'master' into test