Dont allow registrations
Added admin creation of cities
Merge branch 'master' into admin_adding_cities

Conflicts:
	Gemfile