use grand knight portrait for 'loyalists' help description
use warlord portrait for 'northerners' in help description
add khalifate description based on 1.12 release announcement text
Merge branch 'master' of https://github.com/wesnoth/wesnoth