fix http -> https redirection again - Express.js documentation is dicey...
Merge branch 'scheduler' into scheduler-dev

Conflicts:
	app.js