Merge pull request #486 from phonegap/develop

Update master with develop
Merge pull request #509 from phonegap/develop

Develop
Merge remote-tracking branch 'upstream/master' into develop
Fix getLoginStatus return in Android platform