changes to opentest branch only.
fixed bug in attackers & defenders lists filling with battles instead of faction leaders.
updates those lists to fit text better.
added all effects to new conflict related ineractions.
demands to end or leave conflicts correctly no longer include ones where the player is involved as intended.