Added JSON serialization and tests to project
Merge branch 'feature/bandedo/json-serialization' into develop
Merge branch 'develop'