Updated the video daemons
Merge branch 'master' of ssh://github.com/travisdesell/wildlife_at_home

Conflicts:
	webpage/get_expert_video.php
	webpage/video_selector.js
	webpage/video_selector.php