Статьи.
Merge remote-tracking branch 'remotes/origin/dev-art' into dev

Conflicts:
	assets/static/css/common.css