No delete button will appear when a guest or user clicks on a calendar event
splitted calendar_event_click_event as requested
apply, edit, check buttons
Merge remote-tracking branch 'origin/master' into my-schedule-buttons
Send proposal with message no longer needs sender as parameter
Merge remote-tracking branch 'origin/master' into youssefbranch
check and apply working again
+ converter for whole proposals: course-code -> course-id
pmanager can now load requests
Merge remote-tracking branch 'origin/master' into my-schedule-buttons

Conflicts:
	resources/public/js/generic_calendar.js
Merge remote-tracking branch 'origin/master' into my-schedule-buttons

Conflicts:
	resources/public/js/generic_calendar.js -> RESOLVED
Merge pull request #165 from se1-1314/my-schedule-buttons

My schedule buttons
Finished classroom-edit
Merged master
Merge pull request #166 from se1-1314/youssefbranch

Youssefbranch
alert windows
fixed pmanager program listing
Erratic block marking works, schedule checking support

Back-end doesn't accept proposals as valid JSON though
Merge branch 'master' of github.com:se1-1314/xiast

Conflicts:
	resources/public/js/generic_calendar.js
	resources/public/js/pm-schedule.js
Merge branch 'master' into delete_event
+
I fixed an oopsie

Conflicts:
	resources/public/js/generic_calendar.js
Merge branch 'master' into delete_event

Conflicts:
	resources/public/js/generic_calendar.js
Finished classroom edit