Merge branch 'master' of github.com:xiaoshu200/EasyToo

Conflicts:
EasyToo.xcodeproj/project.pbxproj
Merge branch 'master' of github.com:xiaoshu200/EasyToo