Loading from file
Merge branch 'New'

Conflicts:
	src/components/drawings/src/editor/drawings-paintPanel.js
	src/components/drawings/src/translator/drawings-translator.js