Updated the configuration to include all available Hyperion options.
Merge remote-tracking branch 'remotes/origin/master'

Conflicts:
	src/config-tool/ConfigTool/src/org/hyperion/hypercon/spec/DeviceType.java