change
Merge branch 'master' of https://github.com/VT-CHCI/VR_kbase

Conflicts:
	solr/pids/development/sunspot-solr-development.pid
Merge branch 'master' of https://github.com/VT-CHCI/VR_kbase
Merge branch 'master' of https://github.com/VT-CHCI/VR_kbase

Conflicts:
	solr/pids/development/sunspot-solr-development.pid