ok
Merge branch 'origin/master'

Conflicts:
	DPR/ProjectComponent.dpk
	DPR/ProjectComponent.dproj
	Forms/Ancestor/AncestorJournal.dfm
Merge branch 'origin/master'