Merge branch 'edge' with some fucking git shit

Conflicts:
	app/core_modules/filemanager/classes/previewfolder_class_inc.php
	app/core_modules/filemanager/register.conf
Resolved merge conflicts
Doing my best to put a changed file back