refactoring
Merge branch 'master' of https://github.com/lingz/oneform-citizen-mobile