инфо пользователя
Merge branch 'master' of https://github.com/range-web/creator

Conflicts:
	public_html/protected/models/User.php