Merge branch 'master' of https://github.com/menmo/eliteprospects-wordpress-player-link

git-svn-id: https://plugins.svn.wordpress.org/eliteprospects-player-link/trunk@970652 b8457f37-d9ea-0310-8a92-e5e31aec5664