конфиг
Merge branch 'master' of https://github.com/netherspace2k/evrika-deti

Conflicts:
	protected/config/main.php
	protected/runtime/application.log