梁建民 / h5

# Conflicts:
#	view/21.js
#	view/9.js
#	view/app.js

# Conflicts:
#	view/0.js
#	view/1.js
#	view/10.js
#	view/11.js
#	view/12.js
#	view/13.js
#	view/14.js
#	view/15.js
#	view/16.js
#	view/17.js
#	view/18.js
#	view/19.js
#	view/2.js
#	view/20.js
#	view/21.js
#	view/22.js
#	view/3.js
#	view/4.js
#	view/5.js
#	view/6.js
#	view/7.js
#	view/8.js
#	view/9.js
#	view/app.js

# Conflicts:
#	view/css/app.b0927897.css
#	view/css/chunk-1081bba5.c0f345b7.css
#	view/css/chunk-1a310afe.d7e46390.css
#	view/css/chunk-3d2d429e.045485d7.css
#	view/css/chunk-5226221d.b62bb465.css
#	view/css/chunk-a104e3e6.43c91bcb.css
#	view/css/chunk-e78c7db2.927a837d.css
#	view/index.html
#	view/js/chunk-vendors.d5d087bb.js