add gridControl, tabPage, layoutControl
add SaveNew ComponentryTypes, add Mask for connectorsColumn
Merge branch 'master' into sidorov_TypesOfComponentry#670

Conflicts:
	src/PrizmMainProject/Forms/Settings/SettingsXtraForm.cs
add displaying of ComponentTypeName into lookUpEdit at NewJoint
Merge branch 'master' into sidorov_TypesOfComponentry#670

Conflicts:
	src/PrizmMainProject/Forms/MainChildForm/PrizmApplicationXtraForm.Designer.cs
	src/PrizmMainProject/Forms/Settings/SettingsXtraForm.Designer.cs
	src/PrizmMainProject/Forms/Settings/SettingsXtraForm.cs
rename layoutControl3 to componentryTabLayoutControl
Merge pull request #676 from olga-jane/sidorov_TypesOfComponentry#670

types of componentry