ert
Merge branch 'master' of https://github.com/mingal/gmaps

Conflicts:
	Smart/myroutes.php