Merge branch 'hotfix' into develop

src/main/ui/all_locations.html

@@ -21,6 +21,7 @@
 <div id="map"></div>
 <!--<script async defer src="http://maps.google.cn/maps/api/js?key=AIzaSyDNx0I5o5U0HWPjpHqB4N-y4_f-GLZq4oQ&callback=initMap"-->
         <!--type="text/javascript"></script>-->
+
 <script async defer
 src="https://maps.googleapis.com/maps/api/js?key=AIzaSyDNx0I5o5U0HWPjpHqB4N-y4_f-GLZq4oQ&region=aus&language=zh-CN&callback=initMap"
 type="text/javascript"></script>