Merge remote-tracking branch 'working/collab/sprater/patron_statcat_enhancements...

Merge remote-tracking branch 'working/collab/sprater/patron_statcat_enhancements' into patron_statcat_enhancements

Conflicts:
	Open-ILS/src/sql/Pg/950.data.seed-values.sql

Note the conflicts are above are with permission IDs.  I have resolved
the conflicts with the master branch at the time of the merge.  Note
that there are conflicts with these IDs and other branches waiting to
be merged.  Depending upon when this branch is merged, these ID
conflicts will need to be resolved again, and the permission IDs in
the upgrade script will need to be edited as well.

This signof covers the following commit hashes:

+ 5ac38befb7153ed18e604640e2ebf0b95b9eea56
+ 2a7a2bf1c5f61120915d1d5623ddd5c365a93fd9
+ 0fa8c00b098b196b48634c8c2cffe8c63143c7f7
+ 93961e42b1073934582f94db85fccb99881ad0d6
+ a09ac93c8b03f8d9bc13e232fa5259b4f8aa631c
+ 2ba119eb757d45037d69e4df6d252a0be00f2d97
+ 7caa4c27159645155b587b9bb290ec41a961ae2e
+ 586f3c4fc1a5509dc53eff01b688a28b966aa63c
+ 75db6a45c458c7c2154432637dfb6d49327b755b
+ 3570ae808b5c43811e9238d05f41aa99bea1a616
+ c4d4ae6b9cec623f1efbe12ff3d198e3a4b6c44c
+ 46f963d9e5e4c34012850754a8e911b3e724787f
+ bf5416490911d26ada69b35fe539813bfc00d004
+ 3352de3091bd522ba050a2befa0b710d0d630097
+ b94dce0707f1fe5c07ac80d0bec6f22ad0fc5234
+ f50b90a37a9e529d2d773fed068ecd05cbab20a2
+ 845f059b6b9512405b7bc1bba75e45347fe059c7
+ 1b373e8e4485a6bbcc51b90e702f30bed0e9943f
+ 3cf640ca6e273d64fc5a26ea984fab36235b9ff4
+ 0ac5a97b7fa461b73ce02447a113ef4674e73137

Signed-off-by: Jason Stephenson <jstephenson@mvlc.org>