adding geocoder stuff
ignored all things in tmp dir
removing comments
new commit into geocoder
test branch
merging with branch geocoder
adding some locations suport
Merge branch 'master' of https://github.com/minghz/civso
implementing secret map feature
allowing organizations to create locations - polymorphic
Merge branch 'master' of https://github.com/minghz/civso

Conflicts:
	app/views/locations/_form.html.erb
fixing merge issues
Merge branch 'master' of https://github.com/minghz/civso

Conflicts:
	config/routes.rb