maps
Merge remote-tracking branch 'origin/master'

Conflicts:
	google-maps.php
Merge branch 'master' of https://github.com/Fsansa/anadon

Conflicts:
	google-maps.php
Merge branch 'master' of https://github.com/Fsansa/anadon
Merge branch 'master' of https://github.com/Fsansa/anadon