iPad xibs
Revert "iPad xibs"

This reverts commit 1e518773756bf650ab97da07ae4bde352d9f7f6d.
Merge branch 'develop'