Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge remote-tracking branch 'origin/develop'
Merge remote-tracking branch 'origin/develop'
Merge remote-tracking branch 'origin/develop'
Merge remote-tracking branch 'origin/develop'
Merge remote-tracking branch 'origin/develop'
Redone
Some small fixes
Base initialize
Interface changes

Make arrows
Merge remote-tracking branch 'origin/develop'

Conflicts:
	Project_org.v12.suo
	Project_org/OperatorWorkPlace.Designer.cs
	Project_org/Program.cs
	Project_org/ResourceManagerForm.Designer.cs
	Project_org/ResourceManagerForm.resx
	Project_org/bin/Release/Project_org.exe
	Project_org/bin/Release/Project_org.pdb
	Project_org/obj/Release/Project_org.Help.resources
	Project_org/obj/Release/Project_org.csproj.FileListAbsolute.txt
	Project_org/obj/Release/Project_org.csproj.GenerateResource.Cache
	Project_org/obj/Release/Project_org.exe
	Project_org/obj/Release/Project_org.pdb
Merge remote-tracking branch 'origin/develop'

Conflicts:
	Project_org/bin/Release/Project_org.exe
	Project_org/bin/Release/Project_org.pdb
	Project_org/obj/Release/Project_org.csproj.GenerateResource.Cache
	Project_org/obj/Release/Project_org.exe
	Project_org/obj/Release/Project_org.pdb
Fix
Merge remote-tracking branch 'origin/develop'

Conflicts:
	Project_org.v12.suo
	Project_org/bin/Release/Project_org.exe
	Project_org/bin/Release/Project_org.pdb
	Project_org/obj/Release/Project_org.csproj.FileListAbsolute.txt
	Project_org/obj/Release/Project_org.csproj.GenerateResource.Cache
	Project_org/obj/Release/Project_org.exe
	Project_org/obj/Release/Project_org.pdb
Merge branch 'develop'

Conflicts:
	Project_org/bin/Release/Project_org.exe
	Project_org/bin/Release/Project_org.pdb
	Project_org/obj/Release/Project_org.csproj.GenerateResource.Cache
	Project_org/obj/Release/Project_org.exe
	Project_org/obj/Release/Project_org.pdb
Problem
Merge_try