Removed comments and fixed build

Removed comments from Config::LoadCustomSettings and
hopefully the the project works now
Merge branch 'integration' of ssh://helios/home/git/repositories/Nova into integration

Updating my local branch with the latest files from the remote repository