Working on user options
Merge branch 'master' of github.com:laziz-karimov/mitnehm

Conflicts:
	protected/controllers/FeedbackController.php
	protected/controllers/RequestController.php