Merge remote-tracking branch 'origin/MikeBai' into Dmitry

Conflicts:
Grid.xcodeproj/project.pbxproj

Grid.xcodeproj/project.xcworkspace/xcuserdata/lino_dska.xcuserdatad/User
InterfaceState.xcuserstate

Grid.xcodeproj/xcuserdata/lino_dska.xcuserdatad/xcdebugger/Breakpoints_v
2.xcbkptlist
Grid/BottomBar.m
Grid/Desk.h
Grid/Desk.m
Grid/Images.xcassets/BoxTile.imageset/BoxTile.png
Grid/Images.xcassets/spritesnew.imageset/spritesnew.png
Grid/Images.xcassets/spritesnew.imageset/spritesnew@2x.png
Grid/LoginWindow.m
Grid/RegistrationWindow.m
Grid/SettingsMenu.h
Grid/SettingsMenu.m
Grid/TextFieldTags.h
Grid/ViewController.h
Grid/ViewController.m
Waxara/Views/MovableView/BoxView.m
Removed something