Merge branch 'charme_json'
In order to work from command line instead of Eclipse, deprecation of JSONObject.put() needs to be commented out