mm fixed
Merge branch 'SBER' of https://github.com/RedMadRobot/baker into SBER

Conflicts:

Baker.xcworkspace/xcuserdata/vaivaikitay.xcuserdatad/UserInterfaceState.
xcuserstate