Cleaned up all the web pages and iPad web pages
Merge branch 'staging'