entity link
Merge remote-tracking branch 'origin/master'

Conflicts:
	sources/Administrator/EditWorkplaceForm.Designer.cs