sync
Merge branch 'master' of https://github.com/alexliubj/OBG

Conflicts:

	OBG_System/BusinessLogic/obj/Debug/BusinessLogic.csproj.FileListAbsolute.txt
	OBG_System/DataAccess/obj/Debug/DataAccess.csproj.FileListAbsolute.txt
	OBG_System/Model/obj/Debug/OBGModel.csproj.FileListAbsolute.txt
	OBG_System/OBG_System/App_Data/PublishProfiles/OBG_.pubxml
	OBG_System/OBG_System/Bin/Model.dll
	OBG_System/OBG_System/Bin/Model.pdb