Fix to compile on MSVC2012
Move solution file into build/msvc
Merge branch 'feature/fix-win32' into develop