冲突appdelegate
Merge branch 'master' of github.com:tangzc/MM
修改UI