Initial commit
Solving conflicts
global.php fix
global.php fix2
global.php final fix