Import khalifate from wesnoth-umc-dev r19414
Refactor lightfly movetype a bit
Remove explicit nozoc ellipse
Remove unneeded ellipses
wmlindent run
Merge branch 'master' of github.com:wesnoth/wesnoth-old