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

Conflicts:
	.idea/workspace.xml
Merge branch 'master' of https://github.com/goper/seocrm.loc