Remove unused Jackson views
Added /1.0 payment endpoints-- need to clarify exact Json for payment
Payment refactoring (more)
Payment rework ongoing
Merge branch 'integration' into server

Conflicts:
	jaxrs/src/main/java/com/ning/billing/jaxrs/json/BundleJsonNoSubscriptions.java
	jaxrs/src/main/java/com/ning/billing/jaxrs/resources/AccountResource.java
	jaxrs/src/main/java/com/ning/billing/jaxrs/resources/InvoiceResource.java
	jaxrs/src/main/java/com/ning/billing/jaxrs/resources/PaymentResource.java
	payment/src/main/java/com/ning/billing/payment/api/DefaultPaymentInfoEvent.java
	server/src/test/java/com/ning/billing/jaxrs/TestAccount.java
	server/src/test/java/com/ning/billing/jaxrs/TestInvoice.java
Payment rework (check-in only for backup; tests don't even pass yet)
More ongoing payment rework
Rework retry framework for payment
Add account locking and timeout for calls handled in plugin
Unit tests for API
Units tests for payment failure retry
Rewrote one more time the createPayment routine to handle various failure from Plugin failures, Timeout issues and PaymeneError
along with all the correct retry logics. Need additional testting for Plugin failures and timeout issues.
Add Payment retry tests for PluginException and refactor test so same test  also handles PaymentFailure
Initial work for PaymentMethod new APIs
Merge remote branch 'origin/integration' into server

Conflicts:
	analytics/src/main/java/com/ning/billing/analytics/BusinessAccountRecorder.java
	api/src/main/java/com/ning/billing/ErrorCode.java
	api/src/main/java/com/ning/billing/payment/api/PaymentApi.java
	api/src/main/java/com/ning/billing/payment/api/PaymentMethodInfo.java
	jaxrs/src/main/java/com/ning/billing/jaxrs/json/AccountTimelineJson.java
	jaxrs/src/main/java/com/ning/billing/jaxrs/json/InvoiceJsonSimple.java
	jaxrs/src/main/java/com/ning/billing/jaxrs/json/PaymentJsonSimple.java
	jaxrs/src/main/java/com/ning/billing/jaxrs/json/PaymentJsonWithBundleKeys.java
	jaxrs/src/main/java/com/ning/billing/jaxrs/resources/InvoiceResource.java
	jaxrs/src/main/java/com/ning/billing/jaxrs/resources/JaxrsResource.java
	payment/src/main/java/com/ning/billing/payment/api/DefaultPaymentApi.java
	payment/src/main/java/com/ning/billing/payment/dao/AuditedPaymentDao.java
	payment/src/main/java/com/ning/billing/payment/dao/PaymentAttemptSqlDao.java
	payment/src/main/java/com/ning/billing/payment/dao/PaymentDao.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/test/java/com/ning/billing/payment/dao/MockPaymentDao.java
	server/src/main/java/com/ning/billing/server/modules/KillbillServerModule.java
Merge remote branch 'origin/integration' into server

Conflicts:
	jaxrs/src/main/java/com/ning/billing/jaxrs/json/AccountJson.java
	jaxrs/src/main/java/com/ning/billing/jaxrs/json/AccountJsonSimple.java
Fix broken test in overdue caused by changed in mock payment
Added accountId to CreditJson
Merge from integration; Reworked merge in AuditedCollectionDaoBase -> saveEntitiesFromTransaction with the same merge logic for now; Added accountId to CreditJson
jaxrs: add tests for credit and chargeback resources

These are disabled for now, pending work on the payment resource
and the credit resource.

Signed-off-by: Pierre-Alexandre Meyer <pierre@ning.com>
server: use full path to catalog

Avoid relative path issues and use the full path instead.

Signed-off-by: Pierre-Alexandre Meyer <pierre@ning.com>
jaxrs: use compareTo to compare DateTime objects

Reported-by: Stephane Brossier <stephane@ning.com>
Signed-off-by: Pierre-Alexandre Meyer <pierre@ning.com>
Merge branch 'integration' of github.com:ning/killbill into integration