Fixing editEvent, not done yet.
Merge branch 'master' of https://github.com/jonatanl/fellesprosjekt

Conflicts:
	java/src/Models/EventParticipant.java