Merge branch 'master' of github.com:rhomobile/rhodes into curl_update
Merge branch 'curl_update' of github.com:rhomobile/rhodes into curl_update
merged iphone issue fix