Shaman, bag etc fixes update
Merge branch 'master' of https://github.com/Nimaear/O3UI