+
Merge remote-tracking branch 'refs/remotes/origin/master'

Conflicts:
	DATABASE/COMMON/PROCEDURE/Objects/Receipt/gpSelect_Object_Receipt.sql