[totem] (6 commits) Non-fast-forward update to branch wip/hadess/bvw-template

[Bastien Nocera <hadess src gnome org>]

The branch 'wip/hadess/bvw-template' was changed in a way that was not a fast-forward update.
NOTE: This may cause problems for people pulling from the branch. For more information,
please see:

 https://wiki.gnome.org/Git/Help/NonFastForward

Commits removed from the branch:

  2f43d16... backend: Port test to new video widget API
  6477988... main: Port to new video widget API
  457c321... main: Move video widget creation to GtkBuilder
  3834f2e... main: Move bvw_grid to GtkBuilder

Commits added to the branch:

  aa89883... backend: Port test to new video widget API
  6a03561... main: Port to new video widget API
  e702f39... main: Move video widget creation to GtkBuilder
  75bf971... main: Move bvw_grid to GtkBuilder
  6cc4e6f... main: Move spinner to GtkBuilder
  958426b... main: Merge controls.ui into totem.ui