++
Merge branch 'origin/master'

Conflicts:
	Forms/Document/Sale.dfm