Quick fix.
Fix conflict.

Conflicts:
	OperationHandler/homeport/src/homeport.c
Merge pull request #54 from Tibo-lg/HomePortRefactored

Quick fix.