Added estimates and recuring invoices
Merge changes from ryandick