Resetting dev environment
Why twice again?
Fixing management console

Oops.
Merge branch 'dev'

Conflicts:
	app.manifest