Fixed a number of minor bugs remaining after the merge.
BuildQueue acknowledges completion of units properly now.
Fixed a ConcurrentModificationException caused by unitsInTraining
Hashtable.