iPad Customization
Merge branch 'ipad'