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

git-svn-id: https://plugins.svn.wordpress.org/cointent/trunk@1017116 b8457f37-d9ea-0310-8a92-e5e31aec5664
Merge branch 'master' of https://github.com/cointent/cointent-wp-plugin into HEAD

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