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
Fixed nullPointerException in LoginView

Conflicts:
	src/no/ntnu/pu/model/Appointment.java
Merge pull request #59 from chunfantasy/FINALIZING

FINALIZING