Updated JSONObject.
Merge branch 'master' of github.com:szesch/storm-hackathon