Misc. bugfixes. Made a BonusEnchantment class for easier handling of
BonusEnchantments. Added helper functions for getting bonus
enchantments. (getBonusEnchantments(), getBonusWeaponEnchantments(),
getBonusArmorEnchantments())
Merge branch 'dev' into devbranch