Manual fixed
Loris sources renamed for MSVC 2013 compatibility
Merge branch 'windows-version' into develop