Issue # 651
Merge branch 'master' of https://github.com/olga-jane/prizm into Protsenko_files
Merge branch 'master' of https://github.com/olga-jane/prizm into Protsenko_files
Fix merge
Merge branch 'master' of https://github.com/olga-jane/prizm into Protsenko_files
Fix merge
Issue 651
add gridControl, tabPage, layoutControl
update Spool UI
add SaveNew ComponentryTypes, add Mask for connectorsColumn
Delete cut button and cut command
Merge branch 'master' into sidorov_TypesOfComponentry#670

Conflicts:
	src/PrizmMainProject/Forms/Settings/SettingsXtraForm.cs
Issue 651
Merge pull request #19 from olga-jane/master

update from origin
Merge branch 'master' of https://github.com/olga-jane/prizm into Protsenko_files
update spool UI + make control enabled
update IsEditMode
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