- Timesheet Invoicing:
  Fixed sample price list and fixed price list import
Merge remote-tracking branch 'intranet-timesheet2-invoices/master'