Merge pull request #213 from camilin87/master

merge last changes to my branch
fix invite url problem

done
Merge pull request #214 from camilin87/kmoya-dev-branch

Fixed. Invite url problem