Fixes after updated katello_api generated with newer apipie-rails (0.1.1)
Merge pull request #112 from bbuckingham/master-fixes

Fixes after updated katello_api generated with newer apipie-rails (0.1.1)
Merge remote branch 'upstream/master' into content-views-merge
Merge pull request #113 from bbuckingham/content-views-merge

Content views merge in master