DF-757 fixed proportions
Merge branch 'to_master' of github.com:dava/dava.framework into to_master