initial commit
update list of ignored files
modify config file name
Merge branch 'master' of ssh://github.com/csusm-library/mrbs into csusm

Conflicts:
	.gitignore
	AUTHENTICATION
	ChangeLog
	INSTALL
	LANGUAGE
	NEWS
	README
	README.nwauth
	README.sqlapi
	UPGRADE
	auth_ldap.pl
	auth_ldapsearch.pl
	badpw.pl
	checklang.php
	convert_db_to_utf8.php
	crypt_passwd.pl
	destroy.pg.sql
	grant.pg.sql
	help_report.html
	purge.my.sql
	purge.pg.sql
	sample-data.sql
	tables.my.pre41.sql
	tables.my.sql
	tables.pg.pre73.sql
	tables.pg.sql
	testdata.php
	upgrade.my.sql
	upgrade2.my.sql
	upgrade2.pg.sql
	upgrade3.my.sql
	web/Themes/classic126/styling.inc
	web/Themes/default/header.inc
	web/Themes/default/styling.inc
	web/add.php
	web/admin.php
	web/approve_entry_handler.php
	web/areadefaults.inc.php
	web/auth/auth_auth_basic.inc
	web/auth/auth_config.inc
	web/auth/auth_crypt.inc
	web/auth/auth_db.inc
	web/auth/auth_db_ext.inc
	web/auth/auth_ext.inc
	web/auth/auth_imap.inc
	web/auth/auth_imap_php.inc
	web/auth/auth_ldap.inc
	web/auth/auth_nis.inc
	web/auth/auth_none.inc
	web/auth/auth_nw.inc
	web/auth/auth_pop3.inc
	web/auth/auth_smtp.inc
	web/css/mrbs-ie-rtl.css
	web/css/mrbs-ie.css
	web/css/mrbs-ie8.css
	web/css/mrbs-ielte6.css
	web/css/mrbs-ielte7.css.php
	web/css/mrbs-ielte8.css
	web/css/mrbs-mail.css
	web/css/mrbs-print.css.php
	web/css/mrbs-rtl.css.php
	web/css/mrbs.css.php
	web/day.php
	web/dbsys.inc
	web/defaultincludes.inc
	web/del.php
	web/del_entry.php
	web/del_entry_ajax.php
	web/edit_area_room.php
	web/edit_entry.php
	web/edit_entry_handler.php
	web/edit_users.php
	web/functions.inc
	web/functions_ical.inc
	web/functions_mail.inc
	web/functions_table.inc
	web/functions_view.inc
	web/grab_globals.inc.php
	web/help.php
	web/import.php
	web/index.php
	web/internalconfig.inc.php
	web/jquery/datatables/css/mrbs-table.css
	web/jquery/ui/css/sunny/images/ui-bg_gloss-wave_60_fece2f_500x100.png
	web/jquery/ui/css/sunny/images/ui-bg_gloss-wave_90_fff9e5_500x100.png
	web/jquery/ui/css/sunny/images/ui-icons_3d3d3d_256x240.png
	web/jquery/ui/css/sunny/images/ui-icons_eb990f_256x240.png
	web/jquery/ui/css/sunny/images/ui-icons_ed9f26_256x240.png
	web/jquery/ui/jquery-ui-i18n.js
	web/js.inc
	web/js/admin.js.php
	web/js/cell_click.js.php
	web/js/datatables.js.php
	web/js/datepicker.js.php
	web/js/edit_area_room.js.php
	web/js/edit_entry.js.php
	web/js/edit_users.js.php
	web/js/functions.js.php
	web/js/general.js.php
	web/js/multiple.js.php
	web/js/pending.js.php
	web/js/refresh.js.php
	web/js/report.js.php
	web/js/resizable.js.php
	web/js/search.js.php
	web/lang/lang.ca
	web/lang/lang.cs
	web/lang/lang.da
	web/lang/lang.de
	web/lang/lang.el
	web/lang/lang.en
	web/lang/lang.es
	web/lang/lang.eu
	web/lang/lang.fr
	web/lang/lang.he
	web/lang/lang.hu
	web/lang/lang.it
	web/lang/lang.ja
	web/lang/lang.ko
	web/lang/lang.nl
	web/lang/lang.no
	web/lang/lang.pl
	web/lang/lang.pt
	web/lang/lang.pt-br
	web/lang/lang.ru
	web/lang/lang.sl
	web/lang/lang.sv
	web/lang/lang.th
	web/lang/lang.tr
	web/lang/lang.zh-cn
	web/lang/lang.zh-tw
	web/language.inc
	web/mincals.inc
	web/month.php
	web/mrbs_auth.inc
	web/mrbs_sql.inc
	web/mysql.inc
	web/mysqli.inc
	web/pending.php
	web/pgsql.inc
	web/report.php
	web/search.php
	web/session/session_cookie.inc
	web/session/session_host.inc
	web/session/session_http.inc
	web/session/session_ip.inc
	web/session/session_nt.inc
	web/session/session_omni.inc
	web/session/session_php.inc
	web/session/session_remote_user.inc
	web/site_faq/site_faq.html
	web/site_faq/site_faq_de.html
	web/site_faq/site_faq_es.html
	web/site_faq/site_faq_fr.html
	web/site_faq/site_faq_it.html
	web/site_faq/site_faq_nl.html
	web/site_faq/site_faq_sv.html
	web/standard_vars.inc.php
	web/style.inc
	web/systemdefaults.inc.php
	web/trailer.inc
	web/upgrade.inc
	web/upgrade/17/post.inc
	web/upgrade/24/post.inc
	web/upgrade/25/mysql.sql
	web/upgrade/25/pgsql.sql
	web/version.inc
	web/view_entry.php
	web/week.php
Merge MRBS latest with local instance. Merge theme tempalte changes to CSUSM theme.