merge done
Merge branch 'lopv2' of https://github.com/tungha/DiamondTest

Conflicts:
	DiamondTest/src/com/cnc/diamond/components/Game.java
fix something
Merge branch 'lopv2' of https://github.com/tungha/DiamondTest

Conflicts:
	DiamondTest/src/com/cnc/diamond/components/Game.java
add persian char
train enemy char change
bigger menu
add new description
Merge branch 'master' into lopv2

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