user_id added to generating hours plan
Merge branch 'master' of https://github.com/Groarq/tablica
holidays fix 2
Merge branch 'master' of https://github.com/Groarq/tablica
holidays fix 3
Merge branch 'master' of https://github.com/Groarq/tablica
small fix
generate function
improvements
merge conflict