Merge conflict resolution

Signed-off-by: Mike Rylander <mrylander@gmail.com>

diff --cc Open-ILS/src/sql/Pg/002.schema.config.sql
Simple merge

diff --cc Open-ILS/src/sql/Pg/950.data.seed-values.sql
Simple merge

diff --cc Open-ILS/xul/staff_client/chrome/content/main/menu.js
Simple merge