debugging iphone
Merge branch 'jon' into gh-pages