new gems
Merge branch 'lopv2'

Conflicts:
	DiamondTest-desktop/.lop_config/.LOP