Merge branch 'develop'
keys
Merge branch 'develop'

Conflicts:
	app/views/properties/show.html.erb
assets precompile