fixed changes
Merge branch 'develop' of https://github.com/fitmoo/mobile into develop