Katello/katello — pull request #4062 by waldenraines (2014-05-08 18:43:38+00:00)
Title: Merge remote-tracking branch 'upstream/master' into roles

Conflicts:
app/controllers/katello/api/v2/activation_keys_controller.rb
app/controllers/katello/api/v2/subscriptions_controller.rb
app/controllers/katello/api/v2/systems_bulk_actions_controller.rb
app/lib/katello/navigation/content_menu.rb
app/lib/katello/navigation/system_menu.rb
app/models/katello/host_collection.rb
app/models/katello/resource_type.rb
app/views/katello/api/v2/activation_keys/show.json.rabl
lib/katello/plugin.rb
spec/models/permission_spec.rb