Merge branch 'master' into support_domain

* master:
  Fixing bug in PrepareSpellsDialog closing
  Move the IntValue wrapper outside of DDSpellbook, since it doesn't belong there.
  Relocate equipitemcontroller
  Fixing a bug in spell preparation

# Conflicts:
#	src/main/lombok/org/leumasjaffe/charsheet/view/level/LevelUpSpellPanel.java