Fixed nullPointerException in LoginView

Conflicts:
	src/no/ntnu/pu/model/Appointment.java
Merge branches 'FINALIZING' and 'master' of https://github.com/chunfantasy/calendar into FINALIZING
Merge branch 'master' of https://github.com/chunfantasy/calendar into FINALIZING
getByParticipant
Book room is now working properly
Merge remote-tracking branch 'origin/master' into BakkanBranch
Fixed nullPointerException in LoginView

Conflicts:
	src/no/ntnu/pu/model/Appointment.java
connection optimize
Merge branch 'master' of github.com:chunfantasy/calendar into storage
Merge branch 'storage' of github.com:chunfantasy/calendar
connection optimized
connection optimized
Merge pull request #59 from chunfantasy/FINALIZING

FINALIZING
Fixed date rendering in side panel, small fix in WeekView
fixed bugs
Merge branch 'master' of github.com:chunfantasy/calendar
Fixed date rendering in notification side panel, small fix in WeekView
Merge pull request #61 from chunfantasy/FINALIZING

FINALIZING
MERGAN
Merge branch 'master' of https://github.com/chunfantasy/calendar