Merge branch 'feature/upgrader' into feature/advanced-search

client.inc.php

include/class.config.php

scp/admin.inc.php

scp/staff.inc.php

setup/cleanup.php

setup/css/wizard.css

setup/inc/class.setup.php

setup/inc/sql/02decaa2-60fcbee1.patch.sql

setup/inc/sql/522e5b78-02decaa2.patch.sql

setup/inc/sql/60fcbee1-f8856d56.patch.sql

setup/inc/sql/7be60a84-522e5b78.patch.sql

setup/inc/upgrade-aborted.inc.php

setup/inc/upgrade-attachments.inc.php

setup/inc/upgrade-cleanup.inc.php

setup/inc/upgrade-core.inc.php

setup/inc/upgrade-prereq.inc.php

setup/inc/upgrade.inc.php

setup/js/setup.js

setup/p.php

setup/setup.inc.php