Latest bug fixes
Merge branch 'master' of https://github.com/Everly-Okorji/middleware.git

Conflicts:
	CalendarPoll/classic/MyClient.java