add new ubox ads, pre LAN battle
Merge branch 'master' into lopv2

Conflicts:
	DiamondTest-android/.classpath
	DiamondTest/.classpath
	DiamondTest/src/com/cnc/diamond/Diamond.java
	DiamondTest/src/com/cnc/diamond/components/ResultPage.java