Changing functionality to client, calendars
Merge remote-tracking branch 'origin/master'

Conflicts:
	TCP/bin/.gitignore
	TCP/src/GUI/ShowCalendar.java