Merge branch 'phonegap-org-migration'