Where to buy google maps search changed.
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/js/front/javascript.js