again resolving errors
Merge branch 'master' of github.com:vlc/vlc_www
resolving conflicts
adding favicon image