Conflicts:
	module/VuFind/tests/integration-tests/src/VuFindTest/Mink/FavoritesTest.php
	module/VuFind/tests/integration-tests/src/VuFindTest/Mink/RecordActionsTest.php
	themes/bootprint3/css/compiled.css
	themes/bootstrap3/css/compiled.css
	themes/bootstrap3/js/cart.js
	themes/bootstrap3/js/common.js
	themes/bootstrap3/js/facets.js
	themes/bootstrap3/js/hierarchyTree.js
	themes/bootstrap3/js/ill.js
	themes/bootstrap3/js/keep_alive.js
	themes/bootstrap3/js/lightbox.js
	themes/bootstrap3/js/openurl.js
	themes/bootstrap3/js/record.js
	themes/bootstrap3/templates/RecordDriver/SolrDefault/core.phtml
	themes/bootstrap3/templates/RecordDriver/SolrDefault/toolbar.phtml
	themes/bootstrap3/templates/RecordTab/usercomments.phtml
	themes/bootstrap3/templates/cart/cart.phtml
	themes/bootstrap3/templates/collection/view.phtml
	themes/bootstrap3/templates/layout/layout.phtml
	themes/bootstrap3/templates/record/taglist.phtml
	themes/bootstrap3/templates/record/view.phtml