Start implementing a setup wizard.
Merge branch 'master' into tenancy

Conflicts:
	config/routes.rb