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

Conflicts:
	DiHaoOA.Database/DiHaoOA.Database.dbmdl
	DiHaoOA.WinForm/obj/x86/Release/DesignTimeResolveAssemblyReferences.cache
	DiHaoOA.suo
Start to coding of Designer part