1.raildraw 开始结束二维码形式填写
Merge branch 'develop' of github.com:MaxinMicrocyber/SyAutoH into develop

Conflicts:
	src/AMHSDrive/AMHSDrive.cpp
	src/AMHSDrive/AMHSDrive.h
	src/AMHSDrive/amhs_dev_server.h
	src/AMHSDrive/amhs_room.cpp
	src/GuiHub/GuiDataHubI.cpp
	src/GuiHub/GuiDataHubI.h
	src/GuiHub/GuiDataHubI_STK.cpp
	src/common/iConstDef.cpp
	src/common/iConstDef.cs
	src/common/iConstDef.h
	src/common/iGuiHub.cs
Merge branch 'develop' of github.com:sidneeginger/SyAutoH into develop

Conflicts:
	src/AMHSDrive/AMHSDrive.cpp
	src/AMHSDrive/amhs_dev_server.h
	src/AMHSDrive/amhs_room.cpp
	src/GuiHub/GuiDataHubI.cpp
	src/GuiHub/GuiDataHubI.h
	src/GuiHub/GuiDataHubI_STK.cpp
1.change a rails.xml;2.RailView/Form has 4 params?
Merge pull request #32 from MaxinMicrocyber/develop

Develop