Conflicts fixed in:
	lib/wiki-plugins/wikiplugin_fade.php (kept the trunk version but they look totally different now, committers please check)
	templates/wizard/wizard_bar_admin.tpl (also kept the trunk version - committers please check)

Please be (more) careful when modifying the same code in trunk and 16.x while semi-automatic merging is taking place, thanks.