PassCardTemplate AdditionalColumnType
Merge branch 'master' of github.com:xbadcode/Rubezh

Conflicts:
	Projects/Common/FiresecServiceAPI/SKD/Common/OrganizationFilterBase.cs