Borders on UI
Merge remote-tracking branch 'origin/battleanim' into battleanim

Conflicts:
	src/net/fe/fightStage/FightStage.java