fixed diskpage
Merge branch 'master' of github.com:vicentebolea/MRR
compilable partially runnable
too
All tests succcess, ready to integrate, minor bugs expected
Merge branch 'master' of github.com:vicentebolea/MRR into youngmoon

Conflicts:
	src/orthrus/test/all_test