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

Conflicts:

	OBG_System/Model/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	OBG_System/OBG_System.suo
	OBG_System/OBG_System/Bin/BusinessLogic.dll
	OBG_System/OBG_System/Bin/BusinessLogic.pdb
	OBG_System/OBG_System/Bin/DataAccess.dll
	OBG_System/OBG_System/Bin/DataAccess.pdb
	OBG_System/OBG_System/Bin/Model.dll
	OBG_System/OBG_System/Bin/Model.pdb
	OBG_System/OBG_System/Web.config
Merge branch 'master' of https://github.com/alexliubj/OBG

Conflicts:
	OBG_System/BusinessLogic/bin/Debug/BusinessLogic.dll
	OBG_System/BusinessLogic/bin/Debug/BusinessLogic.pdb
	OBG_System/BusinessLogic/bin/Debug/DataAccess.dll
	OBG_System/BusinessLogic/bin/Debug/DataAccess.pdb
	OBG_System/BusinessLogic/bin/Debug/Model.dll
	OBG_System/BusinessLogic/bin/Debug/Model.pdb
	OBG_System/BusinessLogic/obj/Debug/BusinessLogic.csprojResolveAssemblyReference.cache
	OBG_System/BusinessLogic/obj/Debug/BusinessLogic.dll
	OBG_System/BusinessLogic/obj/Debug/BusinessLogic.pdb
	OBG_System/DataAccess/bin/Debug/DataAccess.dll
	OBG_System/DataAccess/bin/Debug/DataAccess.pdb
	OBG_System/DataAccess/bin/Debug/Model.dll
	OBG_System/DataAccess/bin/Debug/Model.pdb
	OBG_System/DataAccess/obj/Debug/DataAccess.csprojResolveAssemblyReference.cache
	OBG_System/DataAccess/obj/Debug/DataAccess.dll
	OBG_System/DataAccess/obj/Debug/DataAccess.pdb
	OBG_System/Model/bin/Debug/Model.dll
	OBG_System/Model/bin/Debug/Model.pdb
	OBG_System/Model/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	OBG_System/Model/obj/Debug/Model.dll
	OBG_System/Model/obj/Debug/Model.pdb
	OBG_System/OBG_System/Bin/BusinessLogic.dll
	OBG_System/OBG_System/Bin/BusinessLogic.pdb
	OBG_System/OBG_System/Bin/DataAccess.dll
	OBG_System/OBG_System/Bin/DataAccess.pdb
	OBG_System/OBG_System/Bin/Model.dll
	OBG_System/OBG_System/Bin/Model.pdb