Maps markets
Merge branch 'master' of github.com:marcgc21/LG_touchscreen

Conflicts:
	earth.php~