Edit AddEvent
Merge branch 'johannes' of https://github.com/jonatanl/fellesprosjekt into johannes

Conflicts:
	java/src/client/AddEvent.java