DDL changes; updates for tag API
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
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
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 remote branch 'origin/integration' into server

Conflicts:
	analytics/src/main/java/com/ning/billing/analytics/BusinessAccountRecorder.java
	analytics/src/test/java/com/ning/billing/analytics/api/TestAnalyticsService.java
	api/src/main/java/com/ning/billing/payment/api/PaymentApi.java
	api/src/main/java/com/ning/billing/payment/api/PaymentAttempt.java
	api/src/main/java/com/ning/billing/payment/api/PaymentInfoEvent.java
	beatrix/src/test/java/com/ning/billing/beatrix/integration/payment/TestNotifyInvoicePaymentApi.java
	payment/src/main/java/com/ning/billing/payment/RequestProcessor.java
	payment/src/main/java/com/ning/billing/payment/api/DefaultPaymentApi.java
	payment/src/main/java/com/ning/billing/payment/api/DefaultPaymentInfoEvent.java
	payment/src/main/java/com/ning/billing/payment/dao/AuditedPaymentDao.java
	payment/src/main/java/com/ning/billing/payment/dao/PaymentSqlDao.java
	payment/src/main/java/com/ning/billing/payment/provider/NoOpPaymentProviderPlugin.java
	payment/src/main/java/com/ning/billing/payment/retry/TimedoutPaymentRetryService.java
	payment/src/main/resources/com/ning/billing/payment/dao/PaymentSqlDao.sql.stg
	payment/src/main/resources/com/ning/billing/payment/ddl.sql
	payment/src/test/java/com/ning/billing/payment/TestRetryService.java
	payment/src/test/java/com/ning/billing/payment/api/TestEventJson.java
	payment/src/test/java/com/ning/billing/payment/api/TestPaymentApi.java
	payment/src/test/java/com/ning/billing/payment/dao/MockPaymentDao.java
	payment/src/test/java/com/ning/billing/payment/dao/TestPaymentDao.java
	payment/src/test/java/com/ning/billing/payment/provider/MockPaymentProviderPlugin.java
Fix unit tests after dreadfl merge operation