UI
UI
Merge branch 'master' of github.com:Carl-Huang/BJD_iOS into working-1