Conflict
Merge branch 'master' of https://github.com/gbrse04/tbl_cr_ios

Conflicts:

TableCross/TableCross.xcodeproj/project.xcworkspace/xcuserdata/nextophn.
xcuserdatad/UserInterfaceState.xcuserstate