Merge branch 'master' of https://github.com/dizhenxiong/qiaopai.git
Merge remote-tracking branch 'origin/master'

Conflicts:
	shell/app-shell-web/src/main/webapp/WEB-INF/jsp/file/create.jsp