minor fixes
Merge branch 'master' of github.com:jonatanl/fellesprosjekt
Fixed a bug in Calendar, == to .equals.
Merge branch 'master' of github.com:jonatanl/fellesprosjekt

Conflicts:
	java/src/client/Calendar.java