Change the /dev/video references to the symlinks from UDEV
Merge remote-tracking branch 'origin/master'