Merge branch 'develop'
Fixing TeamSpeak
Fixing get tokens
Merge branch 'master' into develop