Predictor crashing

Problem with flit id XXXX
Merge branch 'master' of https://github.com/bedoron/HNoCS

Conflicts:
	HNOCS/src/cores/sources/AppSrc.cc
	HNOCS/src/routers/hier/Predictor.cc