b4 merger with online api
Merge branch 'master' into lopv2
merge with master branch
Merge branch 'master' of https://github.com/tungha/DiamondTest into lopv2

Conflicts:
	DiamondTest/src/com/cnc/diamond/leaderboard/ServerSideLeaderBoardApi.java