killbill-aplcache

Merge branch 'master' of github.com:ning/killbill into killbill-account Conflicts: account/src/main/resources/com/ning/billing/account/dao/AccountSqlDao.sql.stg api/src/main/java/com/ning/billing/ErrorCode.java invoice/src/main/java/com/ning/billing/invoice/model/DefaultBillingEvent.java invoice/src/test/java/com/ning/billing/invoice/tests/DefaultInvoiceGeneratorTests.java

Improve exception handling

Correct typos in MemoryEventBus

Separate control tags and descriptive tags; add ControlTagType …

enum; add tests; modify account

improve checks for existence of accounts on create/update; …

add change notifications for account (time zone, locale, next billing date); update dao tests to check time zone, locale, next billing date

add time zone, locale, and next billing date to Account; move …

custom field and tag store tests to util

move BillingEvent and BllingEventSet to Invoice

Merge branch 'master' of github.com:ning/killbill into inv-ent-integration …

(picking up payment/invoice integration work)

Conflicts:
	account/src/main/java/com/ning/billing/account/api/DefaultAccount.java
	account/src/test/java/com/ning/billing/account/dao/AccountDaoTestBase.java
	api/src/main/java/com/ning/billing/invoice/api/InvoiceCreationNotification.java
	api/src/main/java/com/ning/billing/invoice/api/InvoiceUserApi.java
	invoice/src/main/java/com/ning/billing/invoice/api/invoice/DefaultInvoicePaymentApi.java
	invoice/src/main/java/com/ning/billing/invoice/api/user/DefaultInvoiceUserApi.java
	invoice/src/main/java/com/ning/billing/invoice/dao/DefaultInvoiceDao.java
	invoice/src/main/java/com/ning/billing/invoice/dao/InvoiceDao.java
	invoice/src/main/java/com/ning/billing/invoice/dao/InvoiceSqlDao.java
	invoice/src/main/java/com/ning/billing/invoice/glue/InvoiceModule.java
	invoice/src/main/java/com/ning/billing/invoice/model/DefaultInvoice.java
	invoice/src/main/resources/com/ning/billing/invoice/dao/InvoiceSqlDao.sql.stg
	invoice/src/test/java/com/ning/billing/invoice/dao/InvoiceDaoTestBase.java
	invoice/src/test/java/com/ning/billing/invoice/dao/InvoiceDaoTests.java
	pom.xml

Merge branch 'master' of github.com:ning/killbill into inv-ent-integration …

(picking up payment/invoice integration work)

Conflicts:
	account/src/main/java/com/ning/billing/account/api/DefaultAccount.java
	account/src/test/java/com/ning/billing/account/dao/AccountDaoTestBase.java
	api/src/main/java/com/ning/billing/invoice/api/InvoiceCreationNotification.java
	api/src/main/java/com/ning/billing/invoice/api/InvoiceUserApi.java
	invoice/src/main/java/com/ning/billing/invoice/api/invoice/DefaultInvoicePaymentApi.java
	invoice/src/main/java/com/ning/billing/invoice/api/user/DefaultInvoiceUserApi.java
	invoice/src/main/java/com/ning/billing/invoice/dao/DefaultInvoiceDao.java
	invoice/src/main/java/com/ning/billing/invoice/dao/InvoiceDao.java
	invoice/src/main/java/com/ning/billing/invoice/dao/InvoiceSqlDao.java
	invoice/src/main/java/com/ning/billing/invoice/glue/InvoiceModule.java
	invoice/src/main/java/com/ning/billing/invoice/model/DefaultInvoice.java
	invoice/src/main/resources/com/ning/billing/invoice/dao/InvoiceSqlDao.sql.stg
	invoice/src/test/java/com/ning/billing/invoice/dao/InvoiceDaoTestBase.java
	invoice/src/test/java/com/ning/billing/invoice/dao/InvoiceDaoTests.java
	pom.xml

[maven-release-plugin] prepare for next development iteration