return lost template/article.html
Merge branch 'master' into feature-custom

* master:
  return lost template/article.html

Conflicts:
	templates/article.html