Fixing MSVC progem with guichan compliation
Merge branch 'ui'