Upate functions for Tactical UI have been added to TacticalCombatScreen.java
Merge remote-tracking branch 'origin/master'