CalenderController functionality
Merge remote-tracking branch 'origin/master'

Conflicts:
	controller/MasterController.java
	model/Screening.java
Merge branch 'master' of https://github.com/Wutcake/GPP_project