201404091935

Old Version
Merge branch 'master' of https://github.com/mengqingaaa/ERPManagement

Conflicts:
	ERPManagement/Models/ERPMCModel.Designer.cs
	ERPManagement/Models/ERPMCModel.edmx.sql