Conflicts: htdocs/admin/index.php htdocs/lib/db/install.xml htdocs/lib/db/upgrade.php htdocs/lib/version.php htdocs/lib/view.php