replace conflicts
Merge branch 'master' of https://github.com/vitaliykastsiuk/Graphical-Editor