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

Conflicts:
	protected/runtime/application.log
	protected/views/layouts/column2.php