Fix favicons in infos.html
Add caching rules
Merge origin/master into bootstrap