Debugging error
Case where no webproperties
Changed scheduler
Merge branch 'staging'

Conflicts:
	server.js
Revert "Merge branch 'staging'"

This reverts commit 96e54721a5ac5cb30a427672492e69bcc3c14b5d, reversing
changes made to cd1882ec8514f2d9c72ce0f942179429790f6319.
Merge branch 'master' into staging
Fixed scheduler
Fixed scheduler