Merge branch 'master' of EvergreenGitServer:evergreen/joelewis into circ_config_policy

Conflicts:
	Open-ILS/web/templates/default/conify/global/config/circ_matrix_matchpoint.tt2

Signed-off-by: Joseph Lewis <joehms22@gmail.com>

diff --cc Open-ILS/web/templates/default/conify/global/config/circ_matrix_matchpoint.tt2
index 7a09a94,e3725a2..38e95a4
--- 1/Open-ILS/web/templates/default/conify/global/config/circ_matrix_matchpoint.tt2
--- 2/Open-ILS/web/templates/default/conify/global/config/circ_matrix_matchpoint.tt2
+++ b/Open-ILS/web/templates/default/conify/global/config/circ_matrix_matchpoint.tt2
@@@ -5,12 -5,11 +5,12 @@@
      <div>Circulation Policy Configuration</div>
      <div><button dojoType='dijit.form.Button' onClick='cmGrid.showCreatePane()'>New</button></div>
  </div>
- <div dojoType='dijit.layout.ContentPane' layoutAlign='client'>
-     <table  jsId='cmGrid'
-             id='cmGridId'
-             style='height:500px;'
-             dojoType='openils.widget.AutoGrid'
-             fieldOrder="['id', 'active', 'grp', 'org_unit', 'copy_circ_lib', 'copy_owning_lib', 'user_home_ou', 'is_renewal', 'juvenile_flag', 'circ_modifier', 'marc_type', 'marc_form', 'marc_bib_level', 'marc_vr_format', 'ref_flag', 'usr_age_lower_bound', 'usr_age_upper_bound', 'circulate', 'duration_rule', 'renewals', 'hard_due_date', 'recurring_fine_rule', 'grace_period', 'max_fine_rule', 'available_copy_hold_ratio', 'total_copy_hold_ratio', 'script_test']"
++
+ <div dojoType="dijit.layout.ContentPane" layoutAlign="client">
+     <table  jsId="cmGrid"
 -            style="height: 600px;"
++            style="height: 500px;"
+             dojoType="openils.widget.AutoGrid"
+             fieldOrder="['id', 'active', 'grp', 'org_unit', 'copy_circ_lib', 'copy_owning_lib', 'user_home_ou', 'is_renewal', 'juvenile_flag', 'circ_modifier', 'marc_type', 'marc_form', 'marc_bib_level', 'marc_vr_format', 'ref_flag', 'usr_age_lower_bound', 'usr_age_upper_bound', 'item_age', 'circulate', 'duration_rule', 'renewals', 'hard_due_date', 'recurring_fine_rule', 'grace_period', 'max_fine_rule', 'available_copy_hold_ratio', 'total_copy_hold_ratio', 'script_test']"
              defaultCellWidth='"auto"'
              query="{id: '*'}"
              fmClass='ccmm'