Merge with MSW to make a nice parallel programming on both enviroments
More Fixes to make MSW branch work: VLC lib headers and libraries..et al