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 #112 from bbuckingham/master-fixes

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

Content views merge in master
Merge pull request #108 from Katello/content-views

Content views
Ref #3897 - dynamic bindings
Merge pull request #97 from mbacovsky/3897_apipie_bindings

Ref #3897 - dynamic bindings
Fixes #4698 - missing bindings configuration
Merge pull request #114 from mbacovsky/4698-missing-bindings-config

Fixes #4698 - missing bindings configuration
Adding i18n to content view files
Addressing feedback from CV merge PR