Merge branch 'article_type' into develop
moved list of highlights to /highlights and show newsletter subscribe block
Merge branch 'newsletter_subscribe' into develop