---
Merge branch 'origin/master'

Conflicts:
	DATABASE/COMMON/VIEW/Object/00_Object_Contract_InvNumber_View.sql
	Forms/Document/Income.dfm
	TEST/DPR/ProjectTest.dpr
	TEST/DPR/ProjectTest.dproj