Fixes #6187,BZ1125358 - Deleting a resource and creation a new one wont lead to conflicts
Fixes #7126 - Upload docker images to the API
Fixes #7554 - Show user friendly error message on 413
fixes #7711 - adding api errata comparison for content view versions
Merge pull request #4782 from daviddavis/temp/20141029165526

Fixes #7554 - Show user friendly error message on 413
Merge pull request #4761 from daviddavis/temp/20141023155402

Fixes #7126 - Upload docker images to the API
Merge pull request #4571 from adamruzicka/fix-phases

Fixes #7333,BZ1129635 - Deleting a resource and creation a new one wont lead to conflicts
Fixes #7604 - Enable docker image uploads
Merge pull request #4767 from jlsherrill/7701

fixes #7711 - adding api errata comparison for content view versions
Merge pull request #4786 from daviddavis/temp/20141030132721

Fixes #7604 - Enable docker image uploads from the UI
fixes #8131 - hypervisors forced into content host's org, env, and cv

tests and rubocop

updates based on p-r comments
fixes #8232 - fixing db:seed when called twice with seed organization
Merge pull request #4787 from jlsherrill/8232

fixes #8232 - fixing db:seed when called twice with seed organization
Fixes #8225 - RH Cdn url can now be updated

There was a bug preventing CDN url from getting updated
this has now been fixed
Merge pull request #4788 from parthaa/8225

Fixes #8225 - RH Cdn url can now be updated
Merge pull request #4779 from thomasmckay/8131-virt-who

fixes #8131 - hypervisors forced into content host's org, env, and cv