Merge branch 'master' of git://github.com/wesnoth/wesnoth
Fixed broken image reference
Add unit tests for check victory function

Mainly focused on defeat_condition field right now... woudl be good
to add some that test victory_when_enemies_defeated.
Merge branch 'master' of git://github.com/wesnoth/wesnoth
MAI test scenarios: fight_on_without_leader -> defeat_condition

Necessary due to a recent change how the victory conditions are
evaluated.
add config attribute value tests, put them in project files also.
Merge branch 'master' of git://github.com/wesnoth/wesnoth
Catch config::error exception which could be thrown by parser.

I'm not sure if this is necessary as it is not reported, but
worst case is that not doing this could cause malformed
scenario files in the editor folder to crash wesnoth while
browsing in mp_create.
Fix typos in comment
Fixed Li'sar not carrying over correctly
refactor map_location.hpp to drop util.hpp include
Merge branch 'master' of git://github.com/wesnoth/wesnoth
add public to the definition of bad_lexical_cast
Add make_enum macros and a unit test, also add to project files
refactor team to use MAKE_ENUM macro for team::DEFEAT_CONDITION
update changelog
fixup includes and docs of make_enum
fixup lexical cast implementation.

gcc wouldn't compile this when "from" was of type enum, because
it says it wouldn't be initialized. The explicit call to default
constructor fixes it. Thanks to gfgtdf for this simple fix to
this problem.
fixup wmllint to include 1.11.15 changes
Added [portrait] to Hakim

Hakim has a portrait, but his config file is missing it.