Removed generic info from comboboxes.

Comboboxes are only generic after Java7. Fine to leave as they are.
Added functionality for gang-up bonus.