[DF-683] Added stuff for andrdoi
Merge branch 'development' of https://github.com/dava/dava.framework into development