Remove collision in global namespace.

Fixes config/vfs deadlocks on OSX.

git-svn-id: http://svn.wildfiregames.com/public/ps/trunk@15504 3db68df2-c116-0410-a063-a993310a9797
make the AI aware of the game type and start interfacing with wonder victory condition + some fixes

git-svn-id: http://svn.wildfiregames.com/public/ps/trunk@15505 3db68df2-c116-0410-a063-a993310a9797
Merge 'remotes/trunk'