fixed conditionals, had them backwards for string loading
update docs
Merge branch 'master' of https://github.com/NicoM1/IceEntity