as
Merge branch 'master' of github.com:Lapayo/SAMPHP

Conflicts:
	server-folder/php/core/bootstrap.php
	server-folder/php/grandlarc/gamemode.php
a