разные правки
Merge branch 'master' of https://github.com/alexandrSS/demo.git

Conflicts:
	backend/config/main.php