Timecard stable build

Code commits

timecard-master