.idea: import shared settings

Signed-off-by: Pierre-Alexandre Meyer <pierre@mouraf.org>
Merge branch 'master' of github.com:killbill/killbill
beatrix: fix tests issues

* Make sure that all bus handlers are done before continuing tests
* Add missing expected events

Signed-off-by: Pierre-Alexandre Meyer <pierre@mouraf.org>
Merge remote-tracking branch 'origin/master' into entitlement++

Conflicts:
	beatrix/src/test/java/com/ning/billing/beatrix/integration/TestIntegrationBase.java