Signed-off-by: Roman <oksamitnyj@gmail.com>
Merge branch 'master' of git@github.com:oksamitnyj/azovskoe.git

Conflicts:
	config_user.php
	modules/article/article.php

Signed-off-by: Roman <oksamitnyj@gmail.com>