Merge branch 'master' into search-park-name

Conflicts:
	Gemfile.lock
	app/assets/javascripts/parks.js.jsx