fix on join username
Merge branch 'master' of https://github.com/msandrock/buddyshopping