Merge remote-tracking branch 'origin/predictor' into predictor

Conflicts:
	HNOCS/src/routers/hier/PredictorIfc.cc
	HNOCS/src/routers/hier/PredictorIfc.h
Merge branch 'predictor' of https://github.com/bedoron/HNoCS

Conflicts:
	HNOCS/src/routers/hier/PredictorIfc.h