civic organizations
Merge branch 'master' into civics

Conflicts:
	config/application.coffee
Merge pull request #8 from NextPlex/civics

civic organizations