begun merge with updated ruleset from devilduck
Merge branch 'ikrpgbranch_001' into BOTHER

Conflicts:
	IKRPG/charsheet/charsheet_main.xml
	IKRPG/charsheet/charsheet_toplevel.xml