Remove unused files (osx)
Split code
Move table view cells into separate XIBs (osx)
Merge branch 'master' into builds
7.218