Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'ucbdeploy/master'

NOJIRA: Updating code from ucbdeploy/tools
Merge remote-tracking branch 'ucbdeploy/master'

"NOJIRA: Updating local from ucbdeploy"
PAHMA-1017: correct tie-breaking in findcurrentlocations()
Merge branch 'master' of https://github.com/cspace-deployment/Tools
PAHMA-1017: rest of the bits supporting the 'computed vs actual' locations monitoring system
NOJIRA: cleanup and reorg of botgarden solr datasource (originally based on ucjeps datasource)
NOJIRA: Updated CollectionStats, added 'download as CSV' option to GovHoldings

First upload of collectionstats overhaul, added 'download as CSV' option
to govHoldings by request
NOJIRA: Added back barcode warning

Accidentally removed the warning for the barcode webapp (as an aside,
"supercede" is a misspelling)
NOJIRA: incremental improvements to botgarden solr4 prototype datasource
NOJIRA: assorted solr4 datasource enhancements (to all 3 existing datastores)
NOJIRA: Fixed img paths

Changed the img paths to agree with the path on the server; minor spell
check
PAHMA-1049, PAHMA-1050: colon introduced between location and crate, deleted objects now ignored.
Merge branch 'master' of https://github.com/cspace-deployment/Tools
Merge remote-tracking branch 'upstream/master'
NOJIRA: Img paths

Lower-cased the image paths.
Create concat_worktitles.sql

function to concatenate the preferred title and the English non-preferred title (if it exists).
Rename functions/Cinefiles/concat_worktitles.sql to functions/cinefiles/concat_worktitles.sql
Update concat_worktitles.sql

Changed parameter and variable names. Added notes on where this function should be created.
PAHMA-912: initial experimental version of a webapp to do 'bulk editing'