Make the damn thing compile
Merge branch 'master' of https://github.com/MetropoliaPortal/Engine