cleaning
Merge branch 'master' of github.com:tselik/chertanovskaya.ru

Conflicts:
	protected/controllers/UserController.php
	protected/views/user/avatar.php
	protected/views/user/selectAvatar.php