Merge remote-tracking branch 'origin/nilsbranch' into schedule-activity-dialog
cleanup
added "list_all_current_user_courses()" function to get the courses of the user (only titular or pmanager) currently logged in.
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
Merge remote-tracking branch 'origin/master' into schedule-activity-dialog

Conflicts:
	src/xiast/query.clj
Fix free room functionality
- tested add and delete -> succeed
- moved tested -> bugs fixed
- other tests ans bugs fixed
Merge branch 'master' into schedule-activity-dialog
extra commit
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
solved bug on when refreshing the page: location.reload() is now callback of send_proposal
Merge remote-tracking branch 'origin/schedule-activity-dialog' into schedule-activity-dialog
Schedule block suggestions added
Merge branch 'schedule-activity-dialog' of github.com:se1-1314/xiast into schedule-activity-dialog
added calendar_reset placeholder
Merge remote-tracking branch 'origin/schedule-activity-dialog' into schedule-activity-dialog
Merge pull request #157 from se1-1314/schedule-activity-dialog

Schedule activity dialog