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

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