Maxim Kadushkin
5b57ee760b
Merge branch 'develop' into feature/colors-table
# Conflicts:
# apps/common/main/resources/less/loadmask.less
# apps/documenteditor/main/app/controller/Main.js
# apps/documenteditor/main/app/view/FileMenuPanels.js
# apps/documenteditor/main/resources/less/toolbar.less
# apps/presentationeditor/main/app/controller/Main.js
# apps/presentationeditor/main/app/controller/RightMenu.js
# apps/presentationeditor/main/app/view/FileMenuPanels.js
# apps/presentationeditor/main/app/view/SlideSettings.js
# apps/spreadsheeteditor/main/app/controller/Main.js
# apps/spreadsheeteditor/main/app/view/FileMenuPanels.js
# apps/spreadsheeteditor/main/resources/less/toolbar.less