updated
Merge branch 'master' of https://github.com/mikinagai/Moodster

Conflicts:
	find_videos.php
	video.php