Merge commit 'HEAD@{1}'
added loose modules, rendering is stupid
converted planets and players to entities