-Changed colors in colortheme

-fix MOVED bug in battle screen
Merge branch 'master' of https://github.com/theprophet31337/ForgottenSchism
-added shop Inventory to Content

-removed bool uses in Item
-started to work on shop screen