Removed json-api modifications
Merge branch 'development' into feature/plugin-json
Merge pull request #10 from darsadow/feature/plugin-json

Feature/plugin json