Merge pull request #1 from Dreamonesys-Solution/develop-parksj

Develop parksj
1233
Merge remote-tracking branch 'origin/develop-parksj' into develop-parksj
Merge branch 'develop-parksj' of https://github.com/Dreamonesys-Solution/CallCenter into Dreamonesys-Solution-develop-parksj

Conflicts:
	Dreamonesys.CallCenter.Main/Form/FormMain.Designer.cs
	Dreamonesys.CallCenter.Main/Form/FormMain.cs
	Dreamonesys.CallCenter.Main/Form/FormMain.resx
test