upgrade
Merge branch 'master' of https://github.com/andrew020/MarineBrothers

Conflicts:

MarineBrothers.xcodeproj/project.xcworkspace/xcuserdata/langyi.xcuserdat
ad/UserInterfaceState.xcuserstate