Merge branch 'master' of https://github.com/goper/seocrm.loc

Conflicts:
	images/favicon.ico
	protected/config/main.php
	protected/controllers/IndexController.php
	protected/controllers/SiteController.php
	protected/models/LoginForm.php
	protected/models/User.php
	protected/modules/admin/views/layouts/main.php
	protected/runtime/application.log
	protected/views/index/index.php
	protected/views/layouts/main.php
Merge branch 'master' of https://github.com/goper/seocrm.loc

Conflicts:
	protected/config/main.php
	protected/models/User.php
	protected/modules/admin/views/layouts/main.php
	protected/runtime/application.log