Merge master to stable

[TrystanLea]

• fix disk check in usb-import
• old data folders archived rather than deleted in usb-import
• updated installation process to use php ini drop in and new backup location
• updated readme