Flow swapping, AEPing functional :scream:
Gate name refactoring
Merge remote-tracking branch 'origin/master' into efcp

Conflicts:
	src/DIF/EFCP/DTP.cc