Merge pull request #1 from cspace-deployment/master

Updating local repository
PAHMA-1085: Changed field aliases in queries to comply with Solr field naming conventions
Merge pull request #69 from mtblack/master

merge column header name change into upstream