killbill-aplcache

Added a test for payment retries

Improved handling of 0 invoices

Modify entitlement code to support ADDON logics for future …

BP chnage/cancel

Add addon tests and fix some minor issues Restructure entitlement …

tests to use standard slow and fast groups; add by defaukt both fast and slow tests

Minor fixes for addon tests

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