policy
Merge remote-tracking branch 'origin/master'

Conflicts:
	OBG_System/OBG_System/Web.config
Merge remote-tracking branch 'origin/master'

Conflicts:
	OBG_System/OBG_System/Web.config
Revert "Merge remote-tracking branch 'origin/master'"

This reverts commit c876d4b73db9c877fb4cea2f2455a73fe6cafcff.
Merge remote-tracking branch 'origin/master'

Conflicts:
	OBG_System/OBG_System.v11.suo
	OBG_System/OBG_System/Web.config
Merge remote-tracking branch 'origin/master'

Conflicts:
	OBG_System/OBG_System.v11.suo
	OBG_System/OBG_System/Web.config