Added to team
Merge branch 'develop'
Merge branch 'develop'
Update Travis CI config
moved subscribe button outside of attending box on event page
Merge branch 'master' into topic_events_style