killbill-aplcache

Refactoring of Guice modules for greater test modularity

DDL changes; updates for tag API

Merge branch 'integration' of github.com:ning/killbill …

into integration

Conflicts:
	account/src/test/java/com/ning/billing/account/dao/MockAccountDao.java
	analytics/src/test/java/com/ning/billing/analytics/TestAnalyticsListener.java

Merge branch 'integration' of github.com:ning/killbill …

into integration

Conflicts:
	account/src/test/java/com/ning/billing/account/dao/MockAccountDao.java
	analytics/src/test/java/com/ning/billing/analytics/TestAnalyticsListener.java

Merge branch 'integration' of github.com:ning/killbill …

into integration

Conflicts:
	account/src/test/java/com/ning/billing/account/dao/MockAccountDao.java
	analytics/src/test/java/com/ning/billing/analytics/TestAnalyticsListener.java

Fix null Plan or null Phase issue

Fixing test issues

Merge branch 'integration' into server

Merge branch 'integration' into server Conflicts: analytics/src/main/java/com/ning/billing/analytics/AnalyticsListener.java analytics/src/main/java/com/ning/billing/analytics/BusinessSubscriptionTransitionRecorder.java analytics/src/test/java/com/ning/billing/analytics/MockSubscription.java api/src/main/java/com/ning/billing/entitlement/api/user/Subscription.java invoice/src/test/java/com/ning/billing/invoice/notification/TestNextBillingDateNotifier.java junction/src/main/java/com/ning/billing/junction/plumbing/billing/DefaultBillingApi.java junction/src/test/java/com/ning/billing/junction/plumbing/billing/TestDefaultEntitlementBillingApi.java payment/src/main/java/com/ning/billing/payment/api/DefaultPaymentApi.java

Fix testing issues