Grammatik VEHLER
Merge branch 'Master' of https://github.com/Mrmaxmeier/Text-like-Game-Framework into Master

Conflicts:
	server/plugins/chat.py