Resolving conflicts

git-svn-id: https://plugins.svn.wordpress.org/easy-related-posts/trunk@808239 b8457f37-d9ea-0310-8a92-e5e31aec5664
Resolving conflicts

git-svn-id: https://plugins.svn.wordpress.org/easy-related-posts/trunk@808240 b8457f37-d9ea-0310-8a92-e5e31aec5664