Move default port definition from Collage to farric
Changes for latest Collage cleanups
Merge branch 'master' of https://github.com/Eyescale/Equalizer

Conflicts:
	CHANGES.txt