Merge branch 'master' of github.com:cointent/cointent-wp-plugin

git-svn-id: https://plugins.svn.wordpress.org/cointent/trunk@910096 b8457f37-d9ea-0310-8a92-e5e31aec5664