cleanup
Merge branch 'origin-schedule-activity-dialog' into schedule-activity-dialog

Conflicts:
	resources/public/js/autocomplete.js
Javascript stuff for scheduling activities
Merge remote-tracking branch 'refs/remotes/origin/master' into schedule-activity-dialog

Conflicts:
	src/xiast/query.clj
Merge remote-tracking branch 'refs/remotes/origin/master' into schedule-activity-dialog
Fix free room functionality
Merge branch 'schedule-activity-dialog' of github.com:se1-1314/xiast into schedule-activity-dialog

Conflicts:
	resources/public/js/generic_calendar.js
	src/xiast/query.clj