iphone 4 fixes
Merge branch 'master' of github.com:Ecotrust/geosurvey into geosurvey