Conflicts:
	.gitignore
	import/marc.properties
	module/VuFind/sql/migrations/pgsql/3.0/002-modify-resource-columns.sql
	module/VuFind/sql/mysql.sql
	module/VuFind/sql/pgsql.sql
	module/VuFind/src/VuFind/ILS/Driver/MultiBackend.php
	solr/vufind/biblio/conf/schema.xml
	themes/bootprint3/css/compiled.css
	themes/bootstrap3/css/compiled.css
	themes/bootstrap3/js/cart.js
	themes/bootstrap3/js/lightbox.js
	themes/bootstrap3/less/components/autocomplete.less
	themes/bootstrap3/less/components/sidebar.less
	themes/bootstrap3/less/vendor/a11y.less
	themes/bootstrap3/less/vendor/bootstrap-accessibility/bootstrap-accessibility.less
	themes/bootstrap3/less/vendor/bootstrap-accessibility/partials/alerts.less
	themes/bootstrap3/less/vendor/bootstrap-accessibility/partials/buttons.less
	themes/bootstrap3/less/vendor/bootstrap-accessibility/partials/carousel.less
	themes/bootstrap3/less/vendor/bootstrap-accessibility/partials/close.less
	themes/bootstrap3/less/vendor/bootstrap-a...