merge

git-svn-id: http://plugins.svn.wordpress.org/eliteprospects-player-link/trunk@957196 b8457f37-d9ea-0310-8a92-e5e31aec5664
Merge remote-tracking branch 'origin/master'
Merge branch 'master' of https://github.com/menmo/eliteprospects-wordpress-player-link