梁建民 / 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