Rebased
Password on github = bad. :(

Conflicts:

	video_archive_daemons/generate_streaming_videos.php