fixed coflicts
Merge branch 'UIWorkSD' of https://github.com/Nedlinin/SuperKidsDay into UIWorkSD