Merge pull request #74 from baasbox/master

update from origin master
enforce json body conversion if application/json content type is specified
Merge pull request #554 from giastfader/master

enforce json body conversion if application/json content type is specified