resoving conflicts
Merge branch 'master' of github.com:vlc/vlc_www