add gridControl, tabPage, layoutControl
update report type comparison and translation
add SaveNew ComponentryTypes, add Mask for connectorsColumn
Merge branch 'master' into sidorov_TypesOfComponentry#670

Conflicts:
	src/PrizmMainProject/Forms/Settings/SettingsXtraForm.cs
Merge remote-tracking branch 'origin/master' into Morozova_Report
add translation for construction report
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 #673 from olga-jane/Morozova_Report

update report type comparison and translation
Merge pull request #676 from olga-jane/sidorov_TypesOfComponentry#670

types of componentry
Merge branch 'master' into sidorov_RailcarStatusAatRailcarSearch#648

Conflicts:
	src/PrizmMainProject/Properties/Resources.resx