Merge branch 'master' into gh-pages
iPhone
Styling, cleanup
Merge branch 'gh-pages'