killbill-aplcache

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

Merge branch 'master' of github.com:ning/killbill Conflicts: beatrix/src/test/java/com/ning/billing/beatrix/integration/TestBasic.java

start of test scaffolding for beatrix tests

Fix NotificationQueue test API for recursive flag

Rename entitlement event table to entitlement_events

Missing artifect from previous commit needed for tests

Fixing next event date so that it uses the date from the queue …

not now(). Also modified the next event queue to use a direct handler rather than calling the bus.

Removed dup dependency

Merge remote branch 'upstream/master'

Missing modification.