梁建民 / h5

# Conflicts:
#	view/37.js
#	view/38.js
#	view/51.js
#	view/52.js
#	view/53.js
#	view/54.js
#	view/55.js
#	view/56.js
#	view/57.js
#	view/59.js
#	view/60.js