New map tools
Merge branch 'master' of https://github.com/cavasquez/DD

Conflicts:
	bin/DD/Entity.class