Merge branch 'master' of https://github.com/goper/seo-tag.loc
Merge branch 'master' of https://github.com/goper/seo-tag.loc

Conflicts:
	media/js/libs/slider_plugin.js