added hysteresis.test, ms, mrs to hysteresis
Merge remote-tracking branch 'origin/master'

Conflicts:
	Structure/test_rockPyData.py