Plaza-Export for player.js
Merge branch 'master' of https://github.com/thmarti/extraleague

Conflicts:
	src/main/webapp/js/players.js
merged conflict