Merge branch 'develop' into feature/events
Event update
update
update
sql for users_in_event, users and event
Fixed link generator in event listing
Create equals() for User model
update in event
Merge branch 'develop' into powerups/api
Fix context
Merge branch 'powerups/api' into develop
Merge branch 'develop' into feature/events

Conflicts:
	app/controllers/OAuth2.java
	app/models/Membership.java
	app/utils/Authorization.java
	app/utils/Context.java
	conf/evolutions/default/1.sql
	conf/routes
Merge branch 'powerups/api' into develop
Merge branch 'develop' into feature/events
Fix event attendance.
Add EventPowerup.
Merge branch 'feature/events' into develop
Merge branch 'powerups/event' into develop
Merge branch 'develop' into frontend/users
Implement user profile