fixed compilation warnings
Merge branch 'master' of https://github.com/mcdooda/The-Global-Scourge
merge