Merge branch 'master' of https://github.com/eh-am/Infobox-Google-Maps-Example

Conflicts:
	readme.md
Merge branch 'master' of https://github.com/eh-am/Infobox-Google-Maps-Example

Conflicts:
	readme.md