Merge pull request #219 from camilin87/master

merge last changes to my branch
bug fixed when join

If the user is a prof or client can join without checking if he has
other projects
Merge pull request #220 from camilin87/kmoya-dev-branch

Kmoya dev branch