test collab
Merge branch 'master' of https://github.com/Spaii/StuntsControl

Conflicts:
	plugins/chat.admin.php