Merge branch 'dev'
modify the favicons
Merge branch 'master' into dev
added the favicon
Merge branch 'master' into dev
modified the layout of the thumbnails