Fixing GIT conflicts
Merge branch 'master' of https://github.com/kvetak/RINA.git

Conflicts:
	src/DIF/EFCP/EFCP.h
	src/DIF/EFCP/EFCPTable/EFCPTable.h
	src/DIF/EFCP/EFCPTable/EFCPTableEntry.h