fix captcha
clean up
revert back to android-19
clean up formatting
Merge pull request #441 from yate/captcha-fix

Captcha fix and a lot of eclipse whitespace changes.