- Replaced JSONObject to HashMap<String,String>
Merge remote-tracking branch 'origin/master'