Merge remote-tracking branch 'origin/master'

Conflicts:
	Main Program/kingsCorners/kingsCorners.sdf
	Main Program/kingsCorners/kingsCorners.v11.suo
	Main Program/kingsCorners/kingsCorners/kingsCorners.cpp