ENH: adden new tests
FIX: some not commited changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	aco-round/aco-round.proj