Settings
Settings(updated)
Merge branch 'master' of https://github.com/ZAYEC77/Arina

Conflicts:
	protected/modules/settings/views/main/create.php
	protected/modules/settings/views/main/update.php