pooled entities
Merge branch 'master' into flyweight-components

Conflicts:
	src/main/java/com/artemis/EntityManager.java