xcuserState Fix
Merge branch 'dev'
updated UI
Merge branch 'pruduction' into dev