Merge origin/master

Conflicts:
	models/functions/importGeneralFile.php