updated calender
Merge branch 'master' of https://github.com/jxionglim/AfterYouEMS

Conflicts:
	CIS/views.pyc