redone php file headers
Merge remote-tracking branch 'github/master'
Running using namespaces, had to load classes manually from start.php
Merge remote-tracking branch 'github/master'