Merge branch 'master' into lopv2

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