- Fix extra hours + new UI custom report
Merge remote-tracking branch 'origin/master'