added guava; entity-management (archetypes, etc.)
-
Merge branch 'master' of
ssh://git@github.com/mephistopheles42/java-jumpandrun-dev.git

Conflicts:
	core/assets/maps/test01
-