Added layers to RenderSystem and entities

- recombined Rotation and Position into Position
Merge entity system changes into master