implement video ordering, refs #455
Merge branch 'master' into integration