bug found
Merge branch 'UI'

Conflicts:
	DiamondTest/bin/com/cnc/diamond/LibgdxGame.class
	DiamondTest/bin/com/cnc/diamond/components/Menu.class
	DiamondTest/src/com/cnc/diamond/components/Menu.java