add timeShift controls
Fix merge conflicts
Change conflict again to make it look more like original
Merge branch 'mattphoto-master'