[DF-1129]
[DF-1130]
[DF-993]
fixed.
Merge branch 'Android' of https://github.com/adebt/dava.framework into android