Revert
Merge branch 'master' of git://github.com/mxcube/HardwareRepository

Conflicts:
	HardwareObjectFileParser.py
Merge branch 'master' of git://github.com/mxcube/HardwareRepository