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
Merge branches 'FINALIZING' and 'master' of https://github.com/chunfantasy/calendar into FINALIZING
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
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
Merge branch 'master' of https://github.com/chunfantasy/calendar into FINALIZING
Merge branch 'master' into SidePanels

Conflicts:
	src/no/ntnu/pu/gui/panel/AddParticipant.java
Merge pull request #62 from chunfantasy/SidePanels

SidePanels
Merge branch 'master' of https://github.com/chunfantasy/calendar into FINALIZING
Small edits in MainView and WeekView