Merge remote-tracking branch 'remote_codechina/master'

# Conflicts:
#	build/webpack.prod.conf.js
#	src/main.js
#	src/router/index.js