Restoration after rebase

* Re-add clips folder
* Re-merge all channels
* Restore sorting on air date