梁建民 / h5

# Conflicts:
#	view/10.js
#	view/13.js
#	view/14.js
#	view/15.js
#	view/16.js
#	view/18.js
#	view/19.js
#	view/20.js
#	view/21.js
#	view/22.js
#	view/23.js
#	view/3.js
#	view/38.js
#	view/39.js
#	view/48.js
#	view/7.js
#	view/8.js
#	view/9.js
#	view/app.js
#	view/index.html

# Conflicts:
#	view/14.js

# Conflicts:
#	view/14.js

# Conflicts:
#	view/14.js

# Conflicts:
#	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/20.js
#	view/21.js
#	view/3.js
#	view/37.js
#	view/38.js
#	view/47.js
#	view/6.js
#	view/7.js
#	view/8.js
#	view/9.js
#	view/app.js