cleanup
Merge branch 'master' of https://github.com/mkirbst/teamspeak

Conflicts:
	ts3_channels_current
	ts3usersToMysql.pl