Added InvoicePluginApi: ability to add additional items to invoices before sealing
Added InvoicePluginApi: ability to add additional items to invoices before sealing
#201: Ability to use localized email subject
osgi: export SecurityApi to bundles

Signed-off-by: Pierre-Alexandre Meyer <pierre@mouraf.org>
Merge remote-tracking branch 'upstream/osgi-shiro'
security: implement DefaultSecurityApi#logout()

Signed-off-by: Pierre-Alexandre Meyer <pierre@mouraf.org>
Merge remote-tracking branch 'upstream/osgi-shiro'
Merge branch 'master' of github.com:iKentoo/killbill into iKentoo-master

Signed-off-by: Pierre-Alexandre Meyer <pierre@mouraf.org>

Conflicts:
	beatrix/pom.xml
	invoice/src/main/java/org/killbill/billing/invoice/glue/DefaultInvoiceModule.java
	invoice/src/test/java/org/killbill/billing/invoice/InvoiceTestSuiteWithEmbeddedDB.java
	invoice/src/test/java/org/killbill/billing/invoice/TestInvoiceHelper.java
	osgi-bundles/bundles/jruby/pom.xml
	osgi-bundles/bundles/logger/pom.xml
	osgi-bundles/libs/killbill/src/main/java/org/killbill/killbill/osgi/libs/killbill/OSGIKillbillAPI.java
	osgi/pom.xml
	osgi/src/main/java/org/killbill/billing/osgi/DefaultOSGIKillbill.java
	osgi/src/main/java/org/killbill/billing/osgi/KillbillActivator.java
	util/src/main/java/org/killbill/billing/util/config/OSGIConfig.java
Merge remote-tracking branch 'origin/master' into iKentoo-master