Changed forms to use JSONObject class
Merge branch 'master' of https://github.com/jz4112/musoni