Modify a fixture to improve test coverage
Update dependencies with "bundle update"
Update more gem dependencies
Merge branch 'master' into new-backend

Conflicts:
	Gemfile.lock
	test/fixtures/locations.yml
	test/helpers/locations_helper_test.rb
	test/models/location_test.rb