Work in progress

Fixing up prediction mechanism
Merge remote-tracking branch 'origin/predictor' into predictor

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