nearly done tutorial
tutorial nearly done
tutorial done
Merge branch 'master' into lopv2

Conflicts:
	DiamondTest-android/assets/font/perrygot15.fnt
	DiamondTest/src/com/cnc/diamond/components/Game.java