killbill-aplcache

Merge branch 'master' into inv-ent-integration Conflicts: account/src/main/java/com/ning/billing/account/dao/DefaultAccountDao.java payment/src/test/java/com/ning/billing/payment/provider/MockPaymentProviderPlugin.java

Merge branch 'master' of github.com:ning/killbill Conflicts: util/src/main/resources/com/ning/billing/util/ddl.sql

Fix to accountDao; Implemented MockPaymentProviderPlugin; …

Added more fields to Credit Card payment method

fixed price work

Work on integration test

updates to allow fixed and recurring amounts to be correctly …

stored as nulls; fixed aggregation issues

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

into inv-ent-integration

Merge branch 'inv-ent-integration' of git@github.com:ning/killbill …

into inv-ent-integration

beatrix tests

merge