Merge branch 'rel_3_3' of git://git.evergreen-ils.org/Evergreen into HEAD

Signed-off-by: Dan Scott <dan@coffeecode.net>

diff --cc Open-ILS/src/perlmods/lib/OpenILS/Application/Actor.pm
Simple merge

diff --cc Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/Publisher/actor.pm
Simple merge

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

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

diff --cc docs/admin/circulation_limit_groups.adoc
index 88268c9,b7de833..f4468f1
--- 1/docs/admin/circulation_limit_groups.adoc
--- 2/docs/admin/circulation_limit_groups.adoc
+++ b/docs/admin/circulation_limit_groups.adoc
@@@ -10,9 -10,9 +10,9 @@@ limit sets refine circulation policies 
  users can check out.  Circulation limit sets are linked by name to circulation
  policies.
  
- To limit checkouts by copy location:
+ To limit checkouts by shelving location:
  
 -. Click *Administration -> Local Administration ->  Circulation Limit Sets*.
 +. Click *Administration -> Local Administration ->  Circ Limit Sets*.
  . Click *New* to create a new circulation limit set.
  . In the *Owning Library* field, select the library that can create and edit
  this limit set.