randommm
Confirm invitation
Decline invitation
Merge branch 'Madeleine'

Conflicts:
	bin/model/DatabaseConnection.class
Merging