Change Entitlement API to use exceptions instaed of null values
Remove setChargedThroughDateFromTransaction API and refactor invoice code accordingly
Implement new Entitlement API for getting status on AO when chnaging BP (dryRun)
Merge remote branch 'origin/integration' into server
Fix test waiting time
Modify Payment API (remove Either)
DDL changes; updates for tag API
Merging with latest
Fix notification queue (so it can be disabled)
Rework NotificationQ/Persistent Bus configuration
Fix test issues with PersistentBus # threads and poll timeout
- Switched to camelCase-- we can revert later if we decide this is the right thing for the spec
- Added  bundleKeys for invoices and payment from account timeline
- Added targetDate and invoiceDate for invoice
Merge remote branch 'origin/integration' into server

Conflicts:
	beatrix/src/test/java/com/ning/billing/beatrix/integration/TestIntegrationBase.java
	server/src/test/java/com/ning/billing/jaxrs/TestJaxrsBase.java
Various fixes to overdue to get a beatrix test working end-to-end. Last piece still to do - recovery after payment goes through.
Various fixes to overdue to get a beatrix test working end-to-end. Last piece still to do - recovery after payment goes through.
Moving the payment event posting deeper in the stack so that it (hopefully) occurs for all payments, howver initiated
Another fix to get the conditional logic for the state calculation correct
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/dao/AuditedAccountDao.java
	account/src/test/java/com/ning/billing/account/dao/AccountDaoTestBase.java
	analytics/src/main/java/com/ning/billing/analytics/BusinessAccountRecorder.java
	api/src/main/java/com/ning/billing/payment/api/PaymentApi.java
	entitlement/src/main/java/com/ning/billing/entitlement/api/billing/DefaultChargeThruApi.java
	entitlement/src/main/java/com/ning/billing/entitlement/engine/dao/AuditedEntitlementDao.java
	entitlement/src/test/java/com/ning/billing/entitlement/api/TestApiBase.java
	invoice/pom.xml
	invoice/src/main/java/com/ning/billing/invoice/dao/DefaultInvoiceDao.java
	invoice/src/test/java/com/ning/billing/invoice/notification/TestNextBillingDateNotifier.java
	jaxrs/src/main/java/com/ning/billing/jaxrs/resources/AccountResource.java
	payment/src/main/java/com/ning/billing/payment/api/DefaultPaymentApi.java
	payment/src/test/java/com/ning/billing/payment/TestHelper.java
	payment/src/test/java/com/ning/billing/payment/TestRetryService.java
	payment/src/test/java/com/ning/billing/payment/api/TestPaymentApi.java
	util/src/main/java/com/ning/billing/util/bus/dao/PersistentBusSqlDao.java
	util/src/main/java/com/ning/billing/util/notificationq/dao/NotificationSqlDao.java
	util/src/main/resources/com/ning/billing/util/bus/dao/PersistentBusSqlDao.sql.stg
	util/src/main/resources/com/ning/billing/util/ddl.sql
	util/src/main/resources/com/ning/billing/util/notificationq/dao/NotificationSqlDao.sql.stg
	util/src/test/java/com/ning/billing/util/notificationq/dao/TestNotificationSqlDao.java
Fix for NPEs if there is no overdue config
Merge branch 'integration' of github.com:ning/killbill into integration

Conflicts:
	jaxrs/src/main/java/com/ning/billing/jaxrs/json/AccountTimelineJson.java
	jaxrs/src/main/java/com/ning/billing/jaxrs/json/PaymentJsonSimple.java
	jaxrs/src/main/java/com/ning/billing/jaxrs/resources/InvoiceResource.java
	server/src/test/java/com/ning/billing/jaxrs/TestAccount.java
	util/src/main/java/com/ning/billing/util/bus/dao/PersistentBusSqlDao.java
	util/src/main/java/com/ning/billing/util/notificationq/DefaultNotification.java
	util/src/main/java/com/ning/billing/util/notificationq/Notification.java
	util/src/main/java/com/ning/billing/util/notificationq/dao/NotificationSqlDao.java
	util/src/test/java/com/ning/billing/util/notificationq/MockNotificationQueue.java
Merge branch 'integration' of github.com:ning/killbill into integration
Better fix for NPE
Missing an include