killbill-aplcache

Implement total ordering for SubscriptionTransition -> fix …

for demo using IM

- disable testRetries - use Clock in payment tests - add some …

debugging messages to payment mocks

re-enable payment retry test

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

into integration

Conflicts:
	entitlement/src/main/java/com/ning/billing/entitlement/api/billing/DefaultBillingEvent.java
	entitlement/src/main/java/com/ning/billing/entitlement/engine/dao/EntitlementSqlDao.java
	entitlement/src/test/java/com/ning/billing/entitlement/api/billing/TestDefaultBillingEvent.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/dao/InvoiceDaoTests.java
	invoice/src/test/java/com/ning/billing/invoice/tests/DefaultInvoiceGeneratorTests.java

Implement fix for billing event ordering

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

into integration

Fix issue in the use of custom fields in Subscription

- add invoice number (auto_increment field that is only set …

when the invoice is created)
- changed custom field value to not required

- remove InternationalPrice from billing events; pass values …

and currency instead
- constrain target date for invoices to a configurable number of months in the future

update to AccountDao to provide transactional support for …

fetches; minor cleanup in EntitlementSqlDao