Local
Merge branch 'local'

Conflicts:
	app.js
	registry.json
	scouts/screen_scout.js