Removed JSON-java files from project, added build dependency: anishathalye/JSON-java project
Updated unit tests
Merge branch 'dev' into demo