fix
Merge branch 'master' of github.com:pistonov/lunapark-gmap