Calendare changes
Merge branch 'master' of github.com:jonatanl/fellesprosjekt

Conflicts:
	java/src/client/Calendar.java