modify xib
modify xib
Merge branch 'working-2'