Merge remote-tracking branch 'origin/master'

Conflicts:
	ECSMP/EC.cbp
	ECSMP/testAstar.c