Quick fix
Merge branch 'master' into maps-on-create

Conflicts:
	app/models/analysis.rb
Merge pull request #21 from kyruscharities/maps-on-create

Quick fix