Merge pull request #100 from Minrog/master

2.04.0:minrog:4 Holy Truce additions to Events
2.04.0:zeress:30 Better Armies Update