local changes
Merge branch 'master' of https://github.com/xzjcool/DeeHome.git

Conflicts:
	DiHaoOA.Database/DiHaoOA.Database.dbmdl
	DiHaoOA.Database/Tables/Customer.table.sql
	DiHaoOA.WinForm/bin/Release/DiHaoOA.WinForm.vshost.application
	DiHaoOA.WinForm/bin/Release/DiHaoOA.WinForm.vshost.exe.manifest
	DiHaoOA.WinForm/obj/x86/Release/DesignTimeResolveAssemblyReferences.cache
	DiHaoOA.suo
Merge branch 'master' of https://github.com/xzjcool/DeeHome.git

Conflicts:
	DiHaoOA.Database/DiHaoOA.Database.dbmdl
	DiHaoOA.Database/Tables/Customer.table.sql
	DiHaoOA.WinForm/bin/Release/DiHaoOA.WinForm.vshost.application
	DiHaoOA.WinForm/bin/Release/DiHaoOA.WinForm.vshost.exe.manifest
	DiHaoOA.WinForm/obj/x86/Release/DesignTimeResolveAssemblyReferences.cache
	DiHaoOA.suo
Merge branch 'master' of https://github.com/xzjcool/DeeHome
DB Changes and add a few user control