tracking tools are done
new gems image added
some UIs changed
particle changed
Merge branch 'master' of https://github.com/tungha/DiamondTest into lopv2

Conflicts:
	DiamondTest-android/src/com/cnc/diamond/Analytic.java
	DiamondTest-android/src/com/cnc/diamond/FlurryAnalytic.java
	DiamondTest/src/com/cnc/diamond/Diamond.java
	DiamondTest/src/com/cnc/diamond/analytic/AnalyticEvent.java
	DiamondTest/src/com/cnc/diamond/analytic/AnalyticParams.java
	DiamondTest/src/com/cnc/diamond/battle/BattleView.java
	DiamondTest/src/com/cnc/diamond/components/Game.java
	DiamondTest/src/com/cnc/diamond/ui/AnimatedSprite.java