PRIS-12 #time 6h AE, AEPing
Merge branch 'master' of https://github.com/kvetak/RINA

Conflicts:
	src/DAF/IRM/IRM.cc
	src/DIF/FA/FA.cc
	src/DIF/FA/FAI.ned
	src/DIF/IPCProcess.ned
Merge branch 'master' of https://github.com/kvetak/RINA.git

Conflicts:
	src/DIF/EFCP/EFCP.cc
	src/DIF/EFCP/EFCP.ned