Merge branch 'master' of https://github.com/Shestak/ShestakUI
Merge remote-tracking branch 'm/master'