indicators
player update
Merge remote-tracking branch 'ol5/master'

Conflicts:
	static/js/player.js
Merge branch 'master' of github.com:tensor-dev/archer-duel