Merge Fix
Merge branch 'dev' of https://github.com/Castronova/EMIT into dev

Conflicts:
	gui/pnlCreateLink.py