Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

# Conflicts:
#	BLL/bin/Release/BLL.dll
#	BLL/bin/Release/BLL.pdb
#	BLL/bin/Release/DAL.dll
#	BLL/bin/Release/DAL.pdb
#	BLL/bin/Release/DBUtility.dll
#	BLL/bin/Release/DBUtility.pdb
#	BLL/bin/Release/Model.dll
#	BLL/bin/Release/Model.pdb
#	BLL/bin/Release/Pub_Class.dll
#	BLL/bin/Release/Pub_Class.pdb
#	BLL/bin/Release/Pub_Control.dll
#	BLL/bin/Release/Pub_Control.pdb
#	BLL/bin/Release/SQLHelper.dll
#	BLL/bin/Release/SQLHelper.pdb
#	DAL/bin/Release/DAL.dll
#	DAL/bin/Release/DAL.pdb
#	DAL/bin/Release/DBUtility.dll
#	DAL/bin/Release/DBUtility.pdb
#	DAL/bin/Release/Model.dll
#	DAL/bin/Release/Model.pdb
#	DAL/bin/Release/Pub_Class.dll
#	DAL/bin/Release/Pub_Class.pdb
#	DAL/bin/Release/Pub_Control.dll
#	DAL/bin/Release/Pub_Control.pdb
#	DAL/bin/Release/SQLHelper.dll
#	DAL/bin/Release/SQLHelper.pdb
#	DBUtility/bin/Release/DBUtility.dll
#	DBUtility/bin/Release/DBUtility.pdb
#	DBUtility/bin/Release/Pub_Class.dll
#	DBUtility/bin/Release/Pub_Class.pdb
#	DBUtility/bin/Release/Pub_Control.dll
#	DBUtility/bin/Release/Pub_Control.pdb
#	DBUtility/bin/Release/SQLHelper.dll
#	DBUtility/bin/Release/SQLHelper.pdb
#	DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache
#	DBUtility/obj/Release/DBUtility.dll
#	DBUtility/obj/Release/DBUtility.pdb
#	Model/bin/Release/DBUtility.dll
#	Model/bin/Release/DBUtility.pdb
#	Model/bin/Release/Model.dll
#	Model/bin/Release/Model.pdb
#	Model/bin/Release/Pub_Class.dll
#	Model/bin/Release/Pub_Class.pdb
#	Model/bin/Release/Pub_Control.dll
#	Model/bin/Release/Pub_Control.pdb
#	Model/bin/Release/SQLHelper.dll
#	Model/bin/Release/SQLHelper.pdb
#	Model/obj/Release/Model.csproj.AssemblyReference.cache
#	Model/obj/Release/Model.dll
#	Model/obj/Release/Model.pdb
#	Pub_Class/bin/Release/Pub_Class.dll
#	Pub_Class/bin/Release/Pub_Class.pdb
#	Pub_Control/bin/Release/Pub_Class.dll
#	Pub_Control/bin/Release/Pub_Class.pdb
#	Pub_Control/bin/Release/Pub_Control.dll
#	Pub_Control/bin/Release/Pub_Control.pdb
#	SQLHelper/bin/Release/Pub_Class.dll
#	SQLHelper/bin/Release/Pub_Class.pdb
#	SQLHelper/bin/Release/SQLHelper.dll
#	SQLHelper/bin/Release/SQLHelper.pdb
#	SQLHelper/obj/Release/SQLHelper.csproj.AssemblyReference.cache
#	SQLHelper/obj/Release/SQLHelper.dll
#	SQLHelper/obj/Release/SQLHelper.pdb
#	WebAPI/WebAPI.csproj.user