fixed user-workspace bug: non-registered users were not getting their names set
fixed merge-conflict
Merge branch 'master' of github.com:pairide/pairide