aa
Merge branch 'develop' of git://github.com/sidneeginger/SyAutoH into develop
Merge branch 'develop' of git://github.com/sidneeginger/SyAutoH into develop
Logger 界面
onlinelog
Merge branch 'develop' of git://github.com/sidneeginger/SyAutoH into develop

Conflicts:
	src/Gui/MCSControlLib/Logger.Designer.cs
	src/Gui/MCSControlLib/Logger.cs
11
remove the time error
Logger function was edited partly
Merge branch 'develop' of github.com:sidneeginger/SyAutoH into develop
未处理
Merge branch 'develop' of git://github.com/sidneeginger/SyAutoH into develop
Merge branch 'develop' of git://github.com/sidneeginger/SyAutoH into develop
1.rails_coding change pattern;2.pagestkop delete 3 useless handler
test
1.delete push_stk_getroom in guidatahuii_stk
Merge branch 'develop' of github.com:sidneeginger/SyAutoH into develop

Conflicts:
	src/GuiHub/GuiDataHubI.cpp
1.updata
1.delete testwin in Vehicle.cs
Merge branch 'develop' of git://github.com/sidneeginger/SyAutoH into develop