Merge pull request #97 from zijistark/dev

CB fixes and improvements, some comments, rewritten welcome message
Updated ziji's email addr in welcome event
Fancy CB effect localisation for holy war cooldown
Fix: don't block MvM muslim_county_conquest if holy_war_cooldown