refactor map_location.hpp to drop util.hpp include
Merge branch 'master' of git://github.com/wesnoth/wesnoth