fikler med weekno
Merge branch 'master' of https://github.com/mathiasose/fellesprosjekt

Conflicts:
	java_app/src/calendar/AppointmentPanel.java