985092 - removed obsolete Filter prompt, which was appearing as a choice in the list
970774 - further removal of environment visibility in UI in headpin mode
985444-clean-cp-json - remove hibernate fields from candlepin json

985444-clean-cp-json - removed unnecessary considtional
Merge pull request #2650 from thomasmckay/985092

985092 - removed obsolete Filter prompt, which was appearing as a choice...
Merge pull request #2642 from thomasmckay/985444-clean-cp-json

985444-clean-cp-json - remove hibernate fields from candlepin json
Merge pull request #2651 from thomasmckay/970774

970774 - further removal of environment visibility in UI in headpin mode
961024 - Limit available subscriptions for activationkeys by content view
Merge pull request #2634 from mptap/first_feature

961024 - Limit available subscriptions for actkeys by content view
Merge remote-tracking branch 'upstream/master' into delete-legacy-promotion

Conflicts:
	app/models/product.rb
	app/views/systems/_edit.html.haml
Merge pull request #2659 from daviddavis/temp/1374245880

Merging master