Change response format in resources to support json
Merge branch 'feature-change-resource-response-format'