The Albatross and Toucan skins don't work any more

Since Colibri became the default base skin in XWIKI-5751, the velocity templates that were specific to Colibri are now the default templates, breaking the aspect of the other skins. The override direction should be changed, with Albatross and Toucan overriding the files in /templates/, while Colibri doesn't override anything.