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

Conflicts:
	protected/data/crm.db
	protected/views/report/view.php
Merge branch 'master' of https://github.com/goper/seocrm.loc

Conflicts:
	protected/data/crm.db