изменения
Merge branch 'master' of https://github.com/imperia1991/gdeckua

Conflicts:
	protected/views/site/index.php