[DF-3183] Fixed bug with expanding.
Code refactoring after review.
Merge branch 'development' of https://github.com/dava/dava.framework into development

Conflicts:
	Tools/ResourceEditor/Classes/Qt/MaterialEditor/MaterialEditor.cpp
	Tools/ResourceEditor/Classes/Qt/MaterialEditor/MaterialEditor.h