Merge branch '2013.06.3' into 2013.06.0-Nashville

Conflicts:
	vufind/import/Reindexer.jar
	vufind/import/src/org/vufind/MarcRecordDetails.java
	vufind/overdrive_api_extract/overdrive_extract.jar
	vufind/sierra_export/sierra_export.jar