Finished up editing abilities on the Clip Edit page
Merge branch 'master' of https://github.com/basisworldwide/SumTV

Merge commit message
Added to Clip Show to show background and alignment
Merge branch 'master' of https://github.com/basisworldwide/SumTV

Merge commit message