Some fixes
conflict fix
Merge branch 'master' of https://github.com/melatron/TeamPowerPuffGirls