add y to with-aspect naming schema
delete all children's previews when deleting a folder

add phpdoc

Conflicts:
	lib/private/preview.php
Merge pull request #12373 from owncloud/backport_preview_fixes_stable7

Backport preview fixes stable7