Fixed bug

Pretty much caused by a flawed design but OK
Updated SQL
API/Query: add schedule proposal messages
Merge remote-tracking branch 'origin/master' into api-query-tests
Apply proposal without checking
Merge remote-tracking branch 'refs/remotes/origin/api-query-tests' into test-generic-calendar
Bugfix
Merge branch 'origin-api-query-tests' into test-generic-calendar
Updated SQL; Checks for schedule proposals (API)
Added backend call for schedule proposal
Merge remote-tracking branch 'refs/remotes/origin/api-query-tests' into test-generic-calendar
Ignore :id when adding new schedule blocks from proposal
Correct version of schedule-proposal-apply

hopefully!
Fixed schedule proposal submit
Merge remote-tracking branch 'refs/remotes/origin/api-query-tests' into test-generic-calendar
Fixed critical query bug
Merge remote-tracking branch 'origin/api-query-tests' into test-generic-calendar
Schedule proposals correctly generated in js
Merge remote-tracking branch 'refs/remotes/origin/master' into test-generic-calendar

Conflicts:
	resources/public/js/generic_calendar.js
Added schedule apply button