Added functionality to bill through project expense invoices, some cleanups in Invoice and related entities