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