masse
Merge branch 'master' of https://github.com/mathiasose/fellesprosjekt

Conflicts:
	java_app/src/app/CalendarView.java
	java_app/src/appointment/ShowAppointment.java
	java_app/src/db/DBConnection.java