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

Conflicts:
	protected/controllers/ReportController.php
	protected/data/crm.db
	protected/models/Report.php
	protected/modules/admin/controllers/ReportController.php
	protected/modules/admin/views/report/_form.php
	protected/runtime/application.log
	protected/views/report/index.php