Merge remote-tracking branch 'origin/master' into MonthView

Conflicts:
	src/no/ntnu/pu/gui/view/MonthView.java
	src/no/ntnu/pu/gui/view/WeekView.java
Merge remote-tracking branch 'origin/master' into MonthView

Conflicts:
	src/no/ntnu/pu/gui/view/AppointmentView.java
Merge remote-tracking branch 'origin/Calender' into MonthView

Conflicts:
	src/no/ntnu/pu/gui/view/LoginView.java
	src/no/ntnu/pu/storage/ClientStorage.java
	src/no/ntnu/pu/storage/ServerStorage.java
Merge remote-tracking branch 'origin/Calender' into MonthView

Conflicts:
	src/no/ntnu/pu/gui/view/LoginView.java
	src/no/ntnu/pu/storage/ClientStorage.java
	src/no/ntnu/pu/storage/ServerStorage.java