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

Conflicts:
	OBG_System/OBG_System.v11.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