More fixes
Merge branch 'master' of https://github.com/Nedlinin/SuperKidsDay
Merge branch 'master' of https://github.com/Nedlinin/SuperKidsDay
More changes again
blah
Merge remote-tracking branch 'origin/master' into UIWorkSD