Scheduler sent properly.
Merge remote-tracking branch 'origin/master'

Conflicts:
	webserver/app.js