killbill-aplcache

Add addon migration logics

Merge branch 'master' into addon_from_migration Conflicts: entitlement/src/main/java/com/ning/billing/entitlement/alignment/PlanAligner.java

Self code review for addon and alignement before getting back …

into addon; fix minor things

Merge branch 'integration' into addon_from_migration Conflicts: entitlement/src/main/java/com/ning/billing/entitlement/api/user/DefaultEntitlementUserApi.java entitlement/src/main/java/com/ning/billing/entitlement/engine/core/Engine.java

Merge branch 'inv-ent-integration' into addon_from_migration Not …

so trivial merge incorporating latest 'FullCatalog' and also NotitificationQueue

Conflicts:
	entitlement/src/main/java/com/ning/billing/entitlement/alignment/PlanAligner.java
	entitlement/src/main/java/com/ning/billing/entitlement/engine/core/Engine.java
	entitlement/src/main/java/com/ning/billing/entitlement/glue/EntitlementModule.java

Add more tests for addon + fix some addon cancellation issues

More addon functionality (incomplete)

Implement alignement logics for addon on creation with associated …

unit tests

Initially started working on ADDON (tests) and realized there …

is a bug in PlanAlignement for phase (RI-1125)
So, added new test case testCorrectPhaseAlignmentOnChange which repro the issue and later implemented the fix -- test passes now.

Start AO implementation