Merge branch 'feature/facebook_like' into develop
Merge branch 'develop'
style
still working on styling
desktop search page
merge keys
Merge branch 'feature/search_v1' into develop

Conflicts:
	app/views/properties/show.html.erb
little changes
keys
Merge branch 'develop'

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