HOTFIX
In-time commit
Merge remote-tracking branch 'origin/Development' into maaak
FIX registration by invites
Merge remote-tracking branch 'origin/Development' into maaak