梁建民 / h5

# Conflicts:
#	view/1.js
#	view/24.js
#	view/26.js
#	view/27.js
#	view/app.js

# Conflicts:
#	view/1.js
#	view/13.js
#	view/15.js
#	view/18.js
#	view/20.js
#	view/app.js

# 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