adding CLI requires so installs of katello pull in the CLI
Puppet modules: Providing more explicit error message
api v2 gpg controller changes
fixing ng-upload forms for firefox

under firefox ng-upload seems to trigger the callback on page load
so we can just ignore this (as was done in gpg-keys already) if there is no
content
Merge pull request #3615 from jlsherrill/upload

fixing ng-upload forms for firefox
Merge pull request #3570 from parthaa/gpgkey-v1-to-v2

api v2 gpg controller changes
Bastion: adding product and repository sync functionality.

This commit adds bulk actions for products and repositories including
removal, syncing, and sync plan updates.  It also adds the ability
to edit an individual product's sync plan on the product details page.
remove foreman and thumbslug services now that they are no longer used
Merge pull request #3568 from waldenraines/sync-plans

Bastion: adding product and repository sync functionality.
fixing about page brokeness
Fixes gap at the top of pages stemming from recent fix to properly
render navigation.
Expose the susbcription list to the api
Merge pull request #3616 from jlsherrill/ping

fixing about page brokeness
Merge pull request #3614 from daviddavis/temp/20140123125928

Puppet modules: Providing more explicit error message
Merge pull request #3619 from ehelms/fix-ui

Fixes gap at the top of pages stemming from recent fix to properly
Merge pull request #3620 from bkearney/bkearney/subscription-list

Expose the susbcription list to the api
fixing disabled products from showing up by default in the api

also hiding them in the ui
removing non-sensical merge within TaskStatus#as_json

this was causing an error during product rendering in the v2
controllers
add rubygem-hammer_cli_katello to comps
Merge pull request #3627 from jlsherrill/product_fix

removing non-sensical merge within TaskStatus#as_json