Merge remote-tracking branch 'origin/master'

Conflicts:
	ep_link.js
	index.php
	readme.txt

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