Changed the interfaces a bit,
Added a lot of methods to Calendar
Other minor changes
Merge branch 'master' of https://github.com/jonatanl/fellesprosjekt

Conflicts:
	java/src/Models/Alarm.java
	java/src/Models/Event.java
	java/src/Models/EventParticipant.java