Improved Holiday, rspec tests
Improved validations in model Holiday and tests
conflict
Merging branches
Merge branch 'holiday'
Merge branch 'master' of git://github.com/Groarq/tablica
Changed assets working
Merge branch 'master' of https://github.com/Groarq/tablica
Deleted some bootstrap files
Merge branch 'layout'
DefaultWorkTimeRequests+edit
DefaultWorkTimeRequests+edit
DefaultWorkTimeRequests+edit
Fixed DefaultWorkHours
conflict
Merge branch 'master' of git://github.com/Groarq/tablica
Deleted some trash fies
Merge branch 'master' of git://github.com/Groarq/tablica
ffs unexpected )
Merge branch 'master' of https://github.com/Groarq/tablica