cleans up package structure in Character_Main
Merge remote-tracking branch 'origin/master'

Conflicts:
	Hero_Attributes/src/test/java/net/sf/anathema/hero/attributes/AttributeCostCalculatorTest.java