static map scale
fix gmap shortcode
Merge branch 'master' into develop