Внешний вид.
Merge branch 'master' of https://github.com/dev0x13/roxifi

Conflicts:
	protected/controllers/UsersController.php