RelayLink: bugfix
FML: allow lookup by id
Merge branch 'master' into pep8

Conflicts:
	FML/plugin.py