Merge branch 'master' of http://unque781.synology.me:3000/GSI/OHV

# Conflicts:
#	Dev/OHV/OHV.Module.Interactivity/PopUp/ConveyorControlView.xaml
#	Dev/OHV/OHV.Module.Interactivity/PopUp/ConveyorControlViewModel.cs
#	Dev/OHV/OHV.Module.Interactivity/PopUp/DriveServoViewModel.cs
#	Dev/OHV/OHV.Module.Interactivity/PopUp/LockServoView.xaml
#	Dev/OHV/OHV.Vehicle/Concept/D_MainWindowViewModel.cs
#	Dev/OHV/OHV.Vehicle/Config/AlarmDefind.xlsx
#	Dev/OHV/OHV.Vehicle/TimeoutProgress.xaml.cs
#	Dev/OHV/VehicleControlSystem/ControlLayer/MQ/ZmqManager.cs
#	Dev/OHV/VehicleControlSystem/ControlLayer/Vehicle.cs
#	Dev/OHV/VehicleControlSystem/Managers/AutoManager.cs
#	Dev/OHV/VehicleControlSystem/Managers/HostManager.cs

Dev/OHV/OHV.sln

@@ -129,8 +129,8 @@ Global
 		{D6402D97-2206-4D55-8097-8DA9A01568CB}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D6402D97-2206-4D55-8097-8DA9A01568CB}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D6402D97-2206-4D55-8097-8DA9A01568CB}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D6402D97-2206-4D55-8097-8DA9A01568CB}.Remote1|Any CPU.ActiveCfg = Release|Any CPU
-		{D6402D97-2206-4D55-8097-8DA9A01568CB}.Remote1|Any CPU.Build.0 = Release|Any CPU
+		{D6402D97-2206-4D55-8097-8DA9A01568CB}.Remote1|Any CPU.ActiveCfg = Debug|Any CPU
+		{D6402D97-2206-4D55-8097-8DA9A01568CB}.Remote1|Any CPU.Build.0 = Debug|Any CPU
 		{D6402D97-2206-4D55-8097-8DA9A01568CB}.Remote2|Any CPU.ActiveCfg = Remote|Any CPU
 		{D6402D97-2206-4D55-8097-8DA9A01568CB}.Remote2|Any CPU.Build.0 = Remote|Any CPU
 		{712D75B5-89DD-4064-BC4B-2F9D9F157604}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

Dev/OHVDriveLogger/OHVDriveLogger/OHVDriveLogger/App.config

@@ -5,7 +5,7 @@
     </startup>
 
 	<appSettings>
-		<add key="VehicleID" value="V01"/>
+		<add key="VehicleID" value="V02"/>
 		<add key="FTPUploadIP" value="109.19.54.164"/>
 		<add key="PLC_IP" value="192.168.0.20"/>
 		<add key="PLC_PORT" value="5000"/>