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