made changes to the calendar
Merge branch 'master' of https://github.com/amantrip/cs3773

Conflicts:
	members.php