Merge branch 'rel_2_5_rc1' into 2_5_0_merge_test

Conflicts:
	ChangeLog
	Open-ILS/src/perlmods/lib/OpenILS/Application.pm
	Open-ILS/src/sql/Pg/002.schema.config.sql
	Open-ILS/xul/staff_client/chrome/content/main/about.html
	Open-ILS/xul/staff_client/defaults/preferences/prefs.js
	README
	configure.ac
	docs/RELEASE_NOTES_2_5.txt

diff --cc Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Record.pm
Simple merge

diff --cc Open-ILS/src/templates/opac/css/style.css.tt2
Simple merge

diff --cc Open-ILS/src/templates/opac/parts/base.tt2
Simple merge

diff --cc Open-ILS/src/templates/opac/parts/misc_util.tt2
Simple merge

diff --cc build/tools/make_release
Simple merge