Latest strings from zanata
Merge pull request #544 from candlepin/alikins/zanata_2014_3_20

Latest strings from zanata
Revert "Updates for uuid2"

This reverts commit 2e28f539c5f223f17cb8d33f4ed451338b25bbc4.
Also modifies id length of tables created after this commit
from 37 down to 32, and fixes annotations.

Conflicts:
	src/main/resources/db/changelog/changelog-create.xml
	src/main/resources/db/changelog/changelog-update.xml
Merge pull request #546 from candlepin/ckozak/revert_uuid

Revert "Updates for uuid2"
Add Branding model to subscriptions.
Complete branding db mappings for pool and subscription.
Update refresh pools for branding.
Import/export for branding.
Add brand name to cert, WIP.
use branding type from Branding, not product attrs

add new branding info to test data with OS in name
default to null when no branding exists
Merge pull request #545 from candlepin/dgoodwin/branding-round-2

Dgoodwin/branding round 2
Automatic commit of package [candlepin] release [0.9.6-1].
remove ant-nodeps from fedora builds.

We added ant-nodeps so that we could get the Symlink.class from ant.
In Fedora 20, ant-nodeps is no longer available, and Symlink was moved into ant
proper. On Fedora 18 & 19, it is also in ant proper, though the ant package had
a virtual provides for ant-nodeps. But since we already BuildRequires ant,
BuildRequires for ant-nodeps is redundant.

ant-nodeps is still require for RHEL brew builds so we need to make it
conditional.
Automatic commit of package [candlepin] release [0.9.7-1].
Add SLA functionality to Activation Keys.
retain activation key order on register

Conflicts:
	src/main/java/org/candlepin/resource/ConsumerResource.java
Merge pull request #541 from candlepin/wottop/sla_on_activation_key_new

Add SLA functionality to Activation Keys.
Create ActivationKeyRules

More extensive checking of pools before adding them to
activation keys.  Moved all checking logic to rules.js

When listing pools by owner we allow filtering based
on what can be added to a given activation key
Merge pull request #548 from candlepin/ckozak/actkey_pools

Create ActivationKeyRules
Prevent product deletion when referenced by subscriptions

We were only checking for the top level product
before allowing the deletion of a product.

This change includes provided, derived, and derived
provided products.