undo/redo_new
Merge branch 'master' of https://github.com/Gosha-135/scg-web-master

Conflicts:
	.idea/workspace.xml