killbill-memoizeit

[maven-release-plugin] prepare release killbill-0.1.56

Merge branch 'master' of github.com:killbill/killbill

entitlement: invoice: merge system properties correctly …

in tests

Signed-off-by: Pierre-Alexandre Meyer <pierre@ning.com>

Fix Mock notificationQ class

payment: merge system properties from resource file Signed-off-by: …

Pierre-Alexandre Meyer <pierre@ning.com>

Merge branch 'new-paymentpluginapi' Conflicts: .gitignore

Add synchronize in the mock

Merge branch 'new-paymentpluginapi' of github.com:killbill/killbill …

into new-paymentpluginapi

Merge branch 'changes-for-docs' into new-paymentpluginapi Signed-off-by: …

Pierre-Alexandre Meyer <pierre@ning.com>

Conflicts:
	payment/src/test/java/com/ning/billing/payment/PaymentTestSuiteNoDB.java
	payment/src/test/java/com/ning/billing/payment/PaymentTestSuiteWithEmbeddedDB.java
	payment/src/test/java/com/ning/billing/payment/glue/TestPaymentModule.java
	server/src/main/resources/killbill-server.properties
	util/src/main/java/com/ning/billing/util/config/PaymentConfig.java

Merge branch 'new-paymentpluginapi' into changes-for-docs