Merge pull request #102 from zijistark/alpha

Fixed e_germany
Decision icon fix

Very minor fix for a small mistake I made in a few decision icons
Merge pull request #103 from thefinestsieve/beta

Decision icon fix
Un-revert combat traits to new versions