Initial work
Merge branch 'master' into Web
Basic workaround
Merge remote-tracking branch 'origin/master'

Conflicts:
	config.py
Merge branch 'master' into Web
Support for joining and leaving of players