layout change
testing file
delete
logining
Finish addStateActivity. stateActivity still unfinished.
almost finish stateActivity
submit settingActivity
before merging
Merge branch 'zxj'