Conflicts: attendances.php attsettings.php backuplib.php db/install.xml db/upgrade.php export.php lib.php locallib.php manage.php report.php restorelib.php