killbill-aplcache

Merge branch 'integration' into server

Minor change for tests to pass in localtest settings

added check for created and updated dates for account migration

invoice audit

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

into integration

Conflicts:
	account/src/main/java/com/ning/billing/account/api/DefaultAccount.java
	account/src/main/java/com/ning/billing/account/api/user/DefaultAccountUserApi.java
	analytics/src/test/java/com/ning/billing/analytics/MockAccount.java
	api/src/main/java/com/ning/billing/account/api/Account.java
	api/src/main/java/com/ning/billing/account/api/AccountUserApi.java
	api/src/main/java/com/ning/billing/util/api/TagUserApi.java
	entitlement/src/main/java/com/ning/billing/entitlement/api/billing/DefaultEntitlementBillingApi.java
	entitlement/src/main/java/com/ning/billing/entitlement/engine/dao/EntitlementDao.java
	entitlement/src/test/java/com/ning/billing/entitlement/api/billing/BrainDeadAccount.java
	entitlement/src/test/java/com/ning/billing/entitlement/api/billing/BrainDeadAccountUserApi.java
	entitlement/src/test/java/com/ning/billing/entitlement/api/billing/TestDefaultEntitlementBillingApi.java
	invoice/src/test/java/com/ning/billing/invoice/TestInvoiceDispatcher.java
	invoice/src/test/java/com/ning/billing/invoice/glue/InvoiceModuleWithEmbeddedDb.java
	invoice/src/test/java/com/ning/billing/invoice/notification/TestNextBillingDateNotifier.java
	util/src/main/java/com/ning/billing/util/tag/api/DefaultTagDefinitionUserApi.java
	util/src/test/java/com/ning/billing/util/notificationq/TestNotificationQueue.java
	util/src/test/java/com/ning/billing/util/tag/TestTagStore.java

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

into integration

Changed getPaymentAttemptForInvoiceId to return a List; …

renamed to getPaymentAttemptsForInvoiceId

add clock injection to mocktagdao

fix guice issues also, fix bug with EntityCollectionBase::remove

add invoice item type; fix licenses