Remove from the "templates" directory the templates that are specific to colibri

We have recently overwritten some templates in the Flamingo skin. So now, these templates that are in the "templates" directory are actually not generic but specific to the "Colibri" skin. We should remove them from "templates" and put them in "colibri" to clean this a bit.
If not, when a bug comes, a developer cannot know if he should fix it in the "templates" dir on in the "flamingo" dir.
Put them in "colibri" and the developer knows that they are deprecated.