feifan branch
Merge branch 'feifan'

Conflicts:
	HarzardDetectUnit.v