Merge branches 'SidePanels' and 'master' of https://github.com/chunfantasy/calendar

Conflicts:
	src/no/ntnu/pu/gui/view/LoginView.java
	src/no/ntnu/pu/storage/AppointmentStorage.java
	src/no/ntnu/pu/storage/StorageTest.java