Merge branch 'develop_masha' of https://github.com/BitMobile/solutions into develop
Merge branch 'develop' of https://github.com/BitMobile/solutions into develop