Merge branch 'metadata_of_files' into merge_mixed_records

Conflicts:
	CsvImportPlugin.php
	controllers/IndexController.php
	forms/Main.php
	forms/Mapping.php
	views/admin/index/index.php
	views/admin/javascripts/csv-import.js