account email stack
update history_id -> history_record_id
added toJodaPeriod to Duration and DefaultDuration
Merge branch 'integration' of github.com:ning/killbill into integration

Conflicts:
	account/src/main/java/com/ning/billing/account/api/user/DefaultAccountUserApi.java
imports cleanup after merge
name change: send_invoice_emails -> isNotifiedForInvoice
added InvoiceNotifier interface
stabilized invoice templates and translation
Merge branch 'integration' of github.com:ning/killbill into integration

Conflicts:
	invoice/src/main/java/com/ning/billing/invoice/InvoiceDispatcher.java
	invoice/src/test/java/com/ning/billing/invoice/api/migration/MockModuleNoEntitlement.java
	invoice/src/test/java/com/ning/billing/invoice/api/migration/TestDefaultInvoiceMigrationApi.java
	overdue/src/main/java/com/ning/billing/overdue/config/DefaultDuration.java
stabilize template tests; replace entitlement and junction dependencies in invoice with mocks
moved invoice formatting out of util; added InvoiceFormatterFactory and injected into HtmlInvoiceGenerator (extension point for non-default invoice formatters to be added from outside open source project)
moved invoice formatter invoices to api; fixed failing invoice test
fixed tests, licenses
removed unused import
Merge branch 'integration' of github.com:ning/killbill into integration

Conflicts:
	beatrix/src/test/java/com/ning/billing/beatrix/integration/TestIntegration.java
	invoice/src/test/java/com/ning/billing/invoice/notification/TestNextBillingDateNotifier.java
	invoice/src/test/java/com/ning/billing/invoice/tests/DefaultInvoiceGeneratorTests.java
	server/src/test/java/com/ning/billing/jaxrs/TestJaxrsBase.java
updates for tag api
Fix null Plan or null Phase issue
Merge branch 'integration' of github.com:ning/killbill into integration

Conflicts:
	account/src/main/java/com/ning/billing/account/api/DefaultAccount.java
	account/src/main/java/com/ning/billing/account/api/user/DefaultAccountUserApi.java
	api/src/main/java/com/ning/billing/account/api/AccountData.java
	beatrix/src/test/java/com/ning/billing/beatrix/integration/TestIntegration.java
	entitlement/src/main/java/com/ning/billing/entitlement/api/user/SubscriptionData.java
	entitlement/src/test/java/com/ning/billing/entitlement/api/user/TestUserApiAddOn.java
	invoice/src/main/java/com/ning/billing/invoice/InvoiceDispatcher.java
	invoice/src/test/java/com/ning/billing/invoice/api/migration/TestDefaultInvoiceMigrationApi.java
	invoice/src/test/java/com/ning/billing/invoice/notification/TestNextBillingDateNotifier.java
	junction/src/main/java/com/ning/billing/junction/plumbing/api/BlockingAccountUserApi.java
	server/src/test/java/com/ning/billing/jaxrs/TestSubscription.java
Merge branch 'integration' of github.com:ning/killbill into integration

Conflicts:
	account/src/test/java/com/ning/billing/account/dao/MockAccountDao.java
	analytics/src/test/java/com/ning/billing/analytics/TestAnalyticsListener.java
Merge branch 'integration' of github.com:ning/killbill into integration

Conflicts:
	account/src/test/java/com/ning/billing/account/dao/MockAccountDao.java
	analytics/src/test/java/com/ning/billing/analytics/TestAnalyticsListener.java
Merge branch 'integration' of github.com:ning/killbill into integration

Conflicts:
	account/src/test/java/com/ning/billing/account/dao/MockAccountDao.java
	analytics/src/test/java/com/ning/billing/analytics/TestAnalyticsListener.java