Thunder finished
Merge branch 'thunder' of https://github.com/tungha/DiamondTest

Conflicts:
	DiamondTest/src/com/cnc/diamond/components/Test.java
Merged and clean