Add tests for upgrade points
Merge master
Use Calculator for MBRA BAR and BAT
Remove unused eligible_for_mbra_team_bar method
Merge master