Conflicts:
	languages/ca.ini
	module/VuFind/src/VuFind/Controller/Plugin/Holds.php
	themes/blueprint/templates/Recommend/SideFacets.phtml
	themes/bootstrap/js/cart.js
	themes/bootstrap/js/common.js
	themes/bootstrap/js/lightbox.js
	themes/bootstrap/js/record.js
	themes/bootstrap/templates/Auth/AbstractBase/login.phtml
	themes/bootstrap/templates/Recommend/SideFacets.phtml
	themes/bootstrap/templates/RecordDriver/SolrDefault/core.phtml
	themes/bootstrap/templates/RecordDriver/SolrDefault/list-entry.phtml
	themes/bootstrap/templates/RecordTab/holdingsils.phtml
	themes/bootstrap/templates/ajax/export-favorites.phtml
	themes/bootstrap/templates/cart/email.phtml
	themes/bootstrap/templates/cart/export.phtml
	themes/bootstrap/templates/cart/save.phtml
	themes/bootstrap/templates/record/email.phtml
	themes/bootstrap/templates/record/hold.phtml
	themes/bootstrap3/templates/search/results.phtml