Merge TimeExpenses into Master