cities added to membership form
Cities added to membership forms
Merge branch 'master' of github.com:9naQuame/dome

Conflicts:
	app/cache/code/permission_redirects