Merge pull request #71 from polynickglot/master

Fix merge conflicts for timeShift controls