reverting 4 previous commits
Revert "reverting 4 previous commits"

This reverts commit de8274e3a955109b0c76eb91c7226b1f9cca421b.
Merge branch 'master' of github.com:vlc/vlc_www