Reverted branch back to ray

Conflicts:
	DnDTool/src/dndtool/CharacterSheet.java (reverted from commit b56eb960aceff8b499967d2bd9e63d829730f737)