Merge remote-tracking branch 'fraga/workingOnMac'
add os to dllmap in vlcplayer app.config