Merge branch 'refs/heads/master' into autoAwards_formationReading

# Conflicts:
#	MekHQ/src/mekhq/campaign/personnel/autoAwards/AutoAwardsController.java

MekHQ/src/mekhq/campaign/personnel/autoAwards/AutoAwardsController.java

@@ -299,6 +299,11 @@ private void buildAwardLists(int awardListCase) {
 
             for (String setName : allSetNames) {
                 if (!allSetNames.isEmpty()) {
+                    if (Arrays.asList(filterList).contains(setName)) {
+                        logger.info("'{}' was found in the list of sets to be ignored. Ignoring it.", setName);
+                        continue;
+                    }
+
                     logger.info("Getting all awards from set: {}", setName);
 
                     awards.addAll(AwardsFactory.getInstance().getAllAwardsForSet(setName));