Fixed up free schedule block functionality a little
Merge branch 'schedule-activity-dialog' of github.com:se1-1314/xiast into schedule-activity-dialog
Merge remote-tracking branch 'refs/remotes/origin/master' into schedule-activity-dialog
Merge remote-tracking branch 'refs/remotes/origin/master' into schedule-activity-dialog
Add schedule activity almost ready
Merge branch 'master' of github.com:se1-1314/xiast

Conflicts:
	resources/public/js/my-schedule.js
Adding schedule blocks works again

Schedulable activities and rooms are automatically listed.