settings done
Merge branch 'master' of github.com:chinesecold/mobileapp