Revert "shits cray"

This reverts commit 2eb693d4ce54254d6927207e5c225b54f9e9fff0.

Conflicts:
	geo/www/js/googlemaps.js
Merge remote-tracking branch 'origin/master'

Conflicts:
	geo/www/js/googlemaps.js