Merge branch 'master' of https://github.com/BitMobile/core into develop
Merge branch 'develop' of https://github.com/BitMobile/core into develop