update git ignore
merge to bots
Merge branch 'master' into lopv2

Conflicts:
	DiamondTest-desktop/.lop_config/.LOP
	DiamondTest/src/com/cnc/diamond/components/Game.java