Merge branch 'master' of http://47.102.110.240:3000/yuxiangpei/tbServantMini_cloud

# Conflicts:
#	client/app.json