Xcuserstate commit
xcuserstate commit
xcuser ignore
xcuser ignore
Merge branch 'dev_1.0' into issue1