BOTHERSOME CHANGES
Merge branch 'ikrpgbranch_001' into BOTHER

Conflicts:
	IKRPG/charsheet/charsheet_main.xml
	IKRPG/charsheet/charsheet_toplevel.xml
Merge branch 'ikrpgbranch_001' into BOTHER
Merge branch 'abilityfix' into BOTHER