add ubox ads
add generic ads
Merge branch 'lopv2' of https://github.com/tungha/DiamondTest

Conflicts:
	DiamondTest/src/com/cnc/diamond/battle/animations/StateAttack.java
	DiamondTest/src/com/cnc/diamond/battle/animations/StateBack.java
	DiamondTest/src/com/cnc/diamond/battle/animations/StateBeAttacked.java
add robovm project
Merge branch 'master' of https://github.com/tungha/DiamondTest into lopv2

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