Authored by TaoHuang

Merge branch 'master' into feature/topic

# Conflicts:
#	package.json
{
"name": "ufo-app-web",
"version": "1.0.15",
"version": "1.1.2",
"private": true,
"description": "A New Yohobuy Project With Express",
"repository": {
... ...