ok
Merge branch 'origin/master'

Conflicts:
	DPR/Project.dproj
	DPR/Project.res