Method to get the format types object
fix highlighting; using 'html' here screws up the release-pages script
Merge pull request #39 from harikt/format-types

Method to get the format types object
point travis status badge to develop branch
[FIX] TwoStepView::getView() now optionally returns the first view when there is no format specified; this stops exceptions from being raised when the client passes no Accept header and there are multiple view formats available
update comments
udpate changes
updated composer
update composer with version 1.2.1
Merge branch '1.2.1'