nya rubriker
favicon
Merge branch 'dev'
Merge branch 'master' into gh-pages