commit before merge - new deploy 20140405
Merge branch 'master' of https://github.com/ewxgwy1987/CDIA_MES

Conflicts:
	CDIA_MES.suo
	bin/Release/BHS.MES.dll
	bin/Release/BHS.MES.pdb
	bin/Release/PGL.MESGUI.exe
	bin/Release/PGL.MESGUI.pdb
	src/App/PGL.MESGUI/obj/Release/DesignTimeResolveAssemblyReferences.cache
	src/App/PGL.MESGUI/obj/Release/PGL.MESGUI.Properties.Resources.resources
	src/App/PGL.MESGUI/obj/Release/PGL.MESGUI.csprojResolveAssemblyReference.cache
	src/App/PGL.MESGUI/obj/Release/PGL.MESGUI.exe
	src/App/PGL.MESGUI/obj/Release/PGL.MESGUI.pdb
	src/BHS/BHS.MES/obj/Release/BHS.MES.csprojResolveAssemblyReference.cache
	src/BHS/BHS.MES/obj/Release/BHS.MES.dll
	src/BHS/BHS.MES/obj/Release/BHS.MES.pdb
remove unnecessary tracking