sf
Merge branch 'master' into new_tools

Conflicts:
	Control.Geocoder.js

new changes on google search