Update globals.php

master changes
added config file
.gitattribute changes
Merge branch 'master' into Beta
added new file