。。
Merge branch 'master' of https://github.com/StephenZhuang/MobileNJU

Conflicts:
MobileNJU/MobileNJU/MobileNJU-Info.plist
0.0 还是不小心冲突了妈蛋 处理了一下