magic
Merge remote-tracking branch 'origin/master'

Conflicts:
	videos.php
magic
Merge remote-tracking branch 'origin/master'