My merged code

Except I can't test it on Eclipse now because it's being annoying, getting errors like:
unable to resolve target 'android-19' until the SDK is loaded.
The type org.json.JSONObject cannot be resolved. It is indirectly referenced from required .class files.
The type java.lang.Object cannot be resolved
Same deal here. Try not to commit commented out code, unless you want us to look at something.