design reports
merge conflict
Merge pull request #136 from cherkasovas/master

timeoff report form updated