[DF-5230] Improved material sorting
Merge branch 'development' of https://github.com/dava/dava.framework into development