Merge remote-tracking branch 'patrick/master'
fix bug in parenting stills to cineloops
verified correct laterality behavior
Merge remote-tracking branch 'dean/master'