Merged ITrait and IDefaultTrait to Trait
Merge remote-tracking branch 'origin/Anathema3' into Anathema3

Conflicts:
	Character_Main/src/net/sf/anathema/character/impl/view/GroupedFavorableTraitConfigurationView.java
	Character_Main/src/net/sf/anathema/character/view/IGroupedFavorableTraitConfigurationView.java
Merged ITrait and IDefaultTrait to Trait