DF-2765
Merge branch 'framework_0_5_5' of https://github.com/dava/dava.framework into framework_0_5_5