xcuserstate
Merge remote-tracking branch 'origin'
Made emotions selected by default on new resource screen.