Merge branch 'staging' into production
Merge branch 'staging' into production
Merge branch 'staging' into production
Cartdb account

(cherry picked from commit 9618fcfb8c44aa11e964141d39a06c35d59a38e4)
hotfix basemap layer
hot fix: map embed
hot fix: map embed
character counter

Conflicts:
	app/views/admin/organizations/_form.html.erb
	app/views/admin/projects/_form.html.erb
Fixes email regex
merge
resolve conflicts