temporary commit
local branch merged
billing invoices are now generated upon time invoice generation
applied changes suggested after code review
changes made after code review
branch merged and conflicts resolved