killbill-memoizeit

Merge remote-tracking branch 'origin/master' into new-amount-decimals-handling-rfc

[maven-release-plugin] prepare for next development iteration

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

NEWS: prepare for release Signed-off-by: Pierre-Alexandre …

Meyer <pierre@ning.com>

Merge remote-tracking branch 'origin/invoice2' into new-amount-decimals-handling-rfc Signed-off-by: …

Pierre-Alexandre Meyer <pierre@mouraf.org>

Conflicts:
	beatrix/src/test/java/com/ning/billing/beatrix/integration/TestBundleTransfer.java
	beatrix/src/test/java/com/ning/billing/beatrix/integration/TestIntegrationInvoiceWithRepairLogic.java
	beatrix/src/test/java/com/ning/billing/beatrix/integration/overdue/TestOverdueIntegration.java
	invoice/src/main/java/com/ning/billing/invoice/generator/DefaultInvoiceGenerator.java
	invoice/src/test/java/com/ning/billing/invoice/dao/TestInvoiceDao.java
	invoice/src/test/java/com/ning/billing/invoice/generator/TestDefaultInvoiceGeneratorRepairUnit.java

Merge remote-tracking branch 'origin/master' into invoice2

Rework some of the logic for the invoice item tree Javadoc for …

the invoice item tree

Cleanup unsued code from invoice generator

Implementation of invoice tree logic to handle both creating …

view of existing items and merging with proposed item list.

There are a few changes introduced from the previous code:
- Full repair code has been deleted -- was only there for regression test purpose
- Pro-ration logic when calcultaing repair items gives a slightly different result-- and i think more accurate
- Handling of invoice item along with repair has also changed

Tree looks stable at this point, but more work (cleanup, refactoring and tests are needed)

Temporary commit for invoice tree rework