GUI now shows Action Box
Merge branch 'master' of https://github.com/cavasquez/DD

Conflicts:
	src/DD/SlickTools/Entity.java