iPhone4 scaling… continued testing
Merge branch 'master' of ../stage