dog nail removed
Merge branch 'dayGuiDev' of github.com:ifsmirnov/scheduler into develop
conflict fix