Merge pull request #1 from leedenison/master

Fix bugs found at hackathon.
updates for handling JSON responses from image endpoint
off by one on comments
trailing whitespace
Merge pull request #3 from gguuss/master

Update Android for new JSON endpoint response for upload URL