Fixes #8237 : Validate that the user can not set max_content_hosts if unlimited_content_hosts is true
Fixes #8436 - Fixing broken apidoc route and field
fixes #8454 - display product id (sku)
refs #7233 - refactor FactoryGirl methods to after(:action) and use assocation for library
Fixes #8494 - Re-adding the content view filter line
Merge pull request #4790 from bkearney/bkearney/8237

Fixes #8237 : Validate that the user can not set max_content_hosts if un...
Merge pull request #4828 from thomasmckay/sub-sku

fixes #8454 - display product id (sku)
Merge pull request #4820 from daviddavis/temp/20141118104354

Fixes #8436 - Fixing broken apidoc route and field
Merge pull request #4834 from daviddavis/temp/20141124145330

Fixes #8494 - Re-adding the content view filter line
Merge pull request #4832 from shlomizadok/7233

refs #7233 - refactor FactoryGirl methods to after(:action) and use asso...