sync
Merge remote-tracking branch 'origin/master'

Conflicts:
	OBG_System/BusinessLogic/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	OBG_System/OBG_System.suo