Hero Choice in arena UI
fi #6
Merge remote-tracking branch 'origin/master'