Integration of API change from entitlement -> subscription
More entitlement -> subscription renaming
More entitlement -> subscription renaming
More entitlement -> subscription renaming
RE-add beatrix ruby test archive (deleted by mistake)
Disable plugin tests which are broken until we fix the API in the jruby code.
Fix ruby plugin tests that were broken because of renaming entitlement -> subscription
Create new entitlement module and move blocking API from junction into that new module
Rename JunctionApi -> EntitlementApi
JunctionApi -> EntitlementApi
Fix plugin test after API change (OSGI import/export)
Merge remote-tracking branch 'origin/master' into entitlement++

Conflicts:
	beatrix/src/test/java/com/ning/billing/beatrix/integration/TestIntegrationBase.java
Add missing (deleted by git) copyright
Merge remote-tracking branch 'origin/master' into entitlement++
Copyright in IntelliJ
Merge remote-tracking branch 'origin/master' into entitlement++

Conflicts:
	entitlement/killbill-entitlement.iml
Fix flaky tests
Increment oss parent to have latest killbill-api for subscription -> entitlement work
Merge branch 'entitlement++'

Conflicts:
	entitlement/killbill-entitlement.iml
	entitlement/src/test/java/com/ning/billing/entitlement/EntitlementTestSuiteNoDB.java
	subscription/src/test/java/com/ning/billing/subscription/api/user/TestUserApiAddOn.java