fix bug
Merge branch 'master' of https://github.com/wekaservices/eti_app_mobile
merge