updated google maps plugin
Merge pull request #1194 from conejoninja/gmaps

updated google maps plugin
removed bender files
Merge branch 'develop' into testing

Conflicts:
	oc-content/languages/es_ES/index.php
	oc-content/plugins/google_maps/index.php
	oc-content/themes/bender
conflict
bender re-created
Merge branch 'testing' of github.com:conejoninja/Osclass into testing

Conflicts:
	oc-content/themes/bender