Added some functions to JSONParser
Removed logs, made unittest logical
Merge branch 'master' into marketplace
Merge branch 'master' into traveller