update frontpage + category page
Merge origin/master