Some changes
Merge branch 'master' of ssh://git@github.com/johnolos/fpg1.git

Conflicts:
	CalenderApp/src/gui/CreateAppointmentPanel.java
	CalenderApp/src/ktn/Client.java
	CalenderApp/src/ktn/Server.java