Merge branch 'dev'

# Conflicts:
#	src/main/h5/src/main.js

src/main/h5/src/main.js

@@ -25,3 +25,4 @@ new Vue({
   store,
   render: h => h(App)
 }).$mount("#app");
+//test