Merge pull request #384 from bhariharan/unstable

Merge branch 'master' into unstable
Fix for passcode mismatch bug in Android 4.3
Change to endsWith()
Fix for endless loop with bad server
Merge pull request #385 from bhariharan/master

Fix for passcode mismatch bug in Android 4.3
Merge branch 'master' into unstable