Fix a few miscellaneous issues
Merge branch 'master' into ice-cube

Conflicts:
	app/models/location.rb