解决了一些小小小问题
Merge branch 'dev' of github.com:JYWa/teamstyle16 into ricky
简单改进了文档上传和设置功能
Merge branch 'ricky' into dev