Merged upstream v1.04
Merge branch 'HA-VideoFile' of https://github.com/timb28/moodle-mod_videofile into HA-VideoFile

Conflicts:
	version.php