Merge branch 'hotfix-overdriveemailedit'
Merge branch 'hotfix-renewal-issue'
Merge branch 'master' of github.com:eiNetwork/eiNetwork2
Merge branch 'hotfix-wishlist'
Merge branch 'development'
pulled down production reindexer
update release notes
Merge branch 'hotfix-stop-overdrivelogging'
added validation to pickup location select
appended new version number to js in layout. how vufind handles javascript changes needs updated.
Merge branch 'hotfix-pickuplocations' into development
fixing conflicts