fix google map
Merge remote-tracking branch 'upstream/develop' into develop

merge
Merge remote-tracking branch 'upstream/develop' into develop
commit
Merge remote-tracking branch 'upstream/develop' into develop

merge
add shader for hero
Merge pull request #47 from palaa159/develop

Merging Apon's animated hero work