Merge origin/master

Conflicts:
	root/delete_slide.php
Merge origin/master