Change entity map to array
Merge branch 'master' of https://github.com/NicoM1/IceEntity