Merge branch 'master' of github.com:equipmap/equipmap

Conflicts:
	app/views/projects/show.html.erb
	sample_coordinates.yml
Merge branch 'master' of github.com:equipmap/equipmap into mas/android_location

Conflicts:
	app/views/projects/show.html.erb
	sample_coordinates.yml