apply, edit, check buttons
Merge remote-tracking branch 'origin/master' into my-schedule-buttons
check and apply working again
+ converter for whole proposals: course-code -> course-id
Fixed bug with getting schedules
API: yet another bug
API: room-delete
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
Merged master