Conflicts:
setup/wizard/lib/services/unixScheduler.php
setup/wizard/lib/services/windowsLucene.php
setup/wizard/lib/services/windowsOpenOffice.php
setup/wizard/lib/services/windowsScheduler.php
setup/wizard/path.php
setup/wizard/resources/form.js
setup/wizard/resources/wizard.js
setup/wizard/stepAction.php
setup/wizard/steps/services.php
setup/wizard/templates/complete.tpl
setup/wizard/templates/configuration.tpl
setup/wizard/templates/configuration_confirm.tpl
setup/wizard/templates/database.tpl
setup/wizard/templates/database_confirm.tpl
setup/wizard/templates/dependencies.tpl
setup/wizard/templates/install.tpl
setup/wizard/templates/license.tpl
setup/wizard/templates/registration.tpl
setup/wizard/templates/registration_confirm.tpl
setup/wizard/templates/services.tpl
setup/wizard/templates/welcome.tpl
