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
PaymentMethod integration with Account (default PaymentMethod)
Fixing broken tests... more coming
Fix various tests which were broken because of PaymentMethod rewrok
Start adding /1.0 Apis for PaymentMethod -- minimum needed in order to get server tests that pass (more coming on that side)
Move things around NoOpPaymentMethod
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
	jaxrs/src/main/java/com/ning/billing/jaxrs/json/AccountJson.java
	jaxrs/src/main/java/com/ning/billing/jaxrs/json/AccountTimelineJson.java
	jaxrs/src/main/java/com/ning/billing/jaxrs/json/BundleJsonNoSubscriptions.java
	jaxrs/src/main/java/com/ning/billing/jaxrs/json/BundleJsonSimple.java
	jaxrs/src/main/java/com/ning/billing/jaxrs/json/BundleJsonWithSubscriptions.java
	jaxrs/src/main/java/com/ning/billing/jaxrs/json/BundleTimelineJson.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/json/SubscriptionJsonNoEvents.java
	jaxrs/src/main/java/com/ning/billing/jaxrs/json/SubscriptionJsonSimple.java
	jaxrs/src/main/java/com/ning/billing/jaxrs/json/SubscriptionJsonWithEvents.java
	jaxrs/src/main/java/com/ning/billing/jaxrs/resources/ChargebackResource.java
	payment/src/main/java/com/ning/billing/payment/bus/TagHandler.java
Fix broken tests after merge