Updates for the battlefield are in the works
Merge remote-tracking branch 'ben/master'

Conflicts:
	client/game/ingame/play/play.css