Merge branch 'master' of http://192.168.1.123:10080/SDD1/HOZ

# Conflicts:
#	HOZProject/UserControls/UControl_Init.Designer.cs
#	HOZProject/UserControls/UControl_Init.cs