merge with jsonapi-support branch

adds support for jsonapi for formatted json