Bugs from ItemManagementModel
Merge remote-tracking branch 'origin/master'

Conflicts:
	Campaign_Scribe_Conversion/src/test/java/net/sf/anathema/scribe/scroll/conversion/NoteToScrollConverter_Test.java
Hopefully just a simplification for the charm merge functionality
Extracted MartialArtsOptions
Only warning on missing charm in merged or selective charm
Deleted Lunars
Deleted UniqueCharmTypes (Knacks)
Trying to make sense of the Character View system.
* Simplifies some classes, extracts some others
Makes magic use the default way to init itself
Cleanup in character initialization
Minor Refactorings & Cleanup
Removes unused method
Uses ComboSelectionView as part of cost selection view (#332)
* Allows to remove listeners on IObjectSelectionViews
* Fixes some threading-issues
CleanCode and Refactorings (increased readability)
Extracted NonMartialArtsOptions from CharmConfiguration
Refactoring and removed Duplication
Cleanup
Character_Generic_Impl integrated in Character_Generic
Deleted Godblooded
Character_Spirit deleted