Added decorator for content negotiation
Merge branch '0.1.1-contentdecorator' into develop
Merge branch 'develop'