Merge branch 'misc' into hima

Conflicts:
	app-scheduler.js
Update README.md