Add dumbserver
Merge branch 'develop'
Fix join bugs
Merge branch 'develop'