Commit automated upgrade to XCTest
Cast NSUIntegers to ints where needed
Style changes. New color and better layout for different devices