Merge branch 'master' of https://github.com/InvoicePlane/Migrationtool Conflicts: content/backup.php content/config.php content/conversion.php content/start.php engine.php engine/convert_db.php engine/save_backup.php engine/save_config.php index.php
Merge branch 'master' of https://github.com/InvoicePlane/Migrationtool Conflicts: content/backup.php content/config.php content/conversion.php content/start.php engine.php engine/convert_db.php engine/save_backup.php engine/save_config.php index.php