Entity changes
Merge branch 'master' of https://github.com/FBalazs/Ludum-Dare-28