Added JSON parser class
Merge branch 'jsonparser' into develop