Fix the provides statement so it is correct for SCL Builds as well
api v2 environments - only looking up by their numerical IDs
environments model - trivial spacing changes
ak-api - working on system groups for activation keys

ak-api - clean up based on pull-request comments

ak-api - updated to use present?

ak-api - more comments addressed
add comps file for RHEL 5 client
Merge pull request #3651 from komidore64/find-env-yank

for the time being, we're only going to look up katello entities by their IDs
Merge pull request #3675 from thomasmckay/ak-api

ak-api - working on system groups for activation keys
Merge pull request #3648 from jmontleon/fixsclprovides

Fix the provides statement so it is correct for SCL Builds as well
Merge pull request #3696 from jmontleon/add-rhel5-client-comps

add comps file for RHEL 5 client
Removed custom providers from the UI
Added "Anonymous" providers on the backend that are automatically created
removed API docs for provider create and delete
Merge pull request #3700 from Katello/jconnor-remove-content-providers

Jconnor remove content providers
Build: Setting the compass-rails version since the newest version (1.1.4) breaks
the build and fixing a single broken JS test.
Merge pull request #3701 from ehelms/compass-rails-version

Setting the compass-rails version since the newest version (1.1.4) break...
Merge remote-tracking branch 'upstream/master' into cv-merge-master

Conflicts:
	config/routes/api/v2.rb
Merge pull request #3702 from daviddavis/cv-merge-master

Merging in master