Merge branch 'hotfix/article_type'
article margin issue
Merge branch 'hotfix/article_margin_header' into develop