Index: lams_central/src/java/org/lamsfoundation/lams/web/QuestionsController.java
===================================================================
diff -u -radd24141d43ff78942c251760e1614925db89464 -rf92b1383638a766c5d8496c6f607322dd2af8329
--- lams_central/src/java/org/lamsfoundation/lams/web/QuestionsController.java	(.../QuestionsController.java)	(revision add24141d43ff78942c251760e1614925db89464)
+++ lams_central/src/java/org/lamsfoundation/lams/web/QuestionsController.java	(.../QuestionsController.java)	(revision f92b1383638a766c5d8496c6f607322dd2af8329)
@@ -59,7 +59,6 @@
 	    } else if (files.length == 1) {
 		file = files[0];
 		packageName = file.getName().toLowerCase();
-		;
 	    }
 	}
 
@@ -107,6 +106,8 @@
 		? QuestionParser.parseQTIFile(uploadedFileStream, null, limitType)
 		: QuestionParser.parseQTIPackage(uploadedFileStream, limitType);
 	request.setAttribute("questions", questions);
+	
+	FileUtil.deleteTmpFileUploadDir(tmpFileUploadId);
 
 	return "questions/questionChoice";
     }
Index: lams_central/src/java/org/lamsfoundation/lams/web/qb/XmlQuestionsController.java
===================================================================
diff -u -r95d202eb579f0171758a7409c9ae31b89ed5e91a -rf92b1383638a766c5d8496c6f607322dd2af8329
--- lams_central/src/java/org/lamsfoundation/lams/web/qb/XmlQuestionsController.java	(.../XmlQuestionsController.java)	(revision 95d202eb579f0171758a7409c9ae31b89ed5e91a)
+++ lams_central/src/java/org/lamsfoundation/lams/web/qb/XmlQuestionsController.java	(.../XmlQuestionsController.java)	(revision f92b1383638a766c5d8496c6f607322dd2af8329)
@@ -24,11 +24,11 @@
 import org.lamsfoundation.lams.util.FileUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.multipart.MultipartFile;
 
 import com.thoughtworks.xstream.XStream;
 import com.thoughtworks.xstream.io.xml.StaxDriver;
@@ -54,7 +54,8 @@
      * Initializes import questions page.
      */
     @RequestMapping("/initImportQuestionsXml")
-    public String initImportQuestionsXml() throws ServletException {
+    public String initImportQuestionsXml(Model model) throws ServletException {
+	model.addAttribute("tmpFileUploadId", FileUtil.generateTmpFileUploadId());
 	return "qb/importQuestionsXml";
     }
 
@@ -64,24 +65,33 @@
     @SuppressWarnings("unchecked")
     @RequestMapping(path = "/importQuestionsXml", method = RequestMethod.POST)
     @ResponseBody
-    public void importQuestionsXml(@RequestParam("UPLOAD_FILE") MultipartFile file, HttpServletRequest request,
+    public void importQuestionsXml(@RequestParam String tmpFileUploadId, HttpServletRequest request,
 	    @RequestParam long collectionUid) throws ServletException {
 	List<String> toolsErrorMsgs = new ArrayList<>();
 	try {
-	    String uploadPath = FileUtil.createTempDirectory("_uploaded_2questions_xml");
+	    File file = null;
+	    File uploadDir = FileUtil.getTmpFileUploadDir(tmpFileUploadId);
+	    if (uploadDir.canRead()) {
+		File[] files = uploadDir.listFiles();
+		if (files.length > 1) {
+		    FileUtil.deleteTmpFileUploadDir(tmpFileUploadId);
+		    throw new RuntimeException("Uploaded more than 1 file");
+		}
+		if (files.length == 1) {
+		    file = files[0];
+		}
+	    }
 
 	    // filename on the client
-	    String filename = FileUtil.getFileName(file.getOriginalFilename());
-	    File destinationFile = new File(uploadPath, filename);
-	    file.transferTo(destinationFile);
-
+	    String filename = FileUtil.getFileName(file.getName());
 	    String fileExtension = FileUtil.getFileExtension(filename);
 	    if (!fileExtension.equalsIgnoreCase("xml")) {
+		FileUtil.deleteTmpFileUploadDir(tmpFileUploadId);
 		throw new RuntimeException("Wrong file extension. Xml is expected");
 	    }
 
 	    // import learning design
-	    String fullFilePath = destinationFile.getAbsolutePath();
+	    String fullFilePath = file.getAbsolutePath();
 	    // String learningDesignPath = ZipFileUtil.expandZip(new FileInputStream(designFile), filename2);
 	    // FileUtil.getFullPath(learningDesignPath, ExportToolContentService.LEARNING_DESIGN_FILE_NAME);
 	    List<QbQuestion> questions = (List<QbQuestion>) FileUtil.getObjectFromXML(null, fullFilePath);
@@ -144,6 +154,8 @@
 	if (toolsErrorMsgs.size() > 0) {
 	    request.setAttribute("toolsErrorMessages", toolsErrorMsgs);
 	}
+
+	FileUtil.deleteTmpFileUploadDir(tmpFileUploadId);
     }
 
     /**
Index: lams_central/web/qb/importQuestionsXml.jsp
===================================================================
diff -u -r21555f88fd0c63a4a9eb3ae288a2e1d48452aa4b -rf92b1383638a766c5d8496c6f607322dd2af8329
--- lams_central/web/qb/importQuestionsXml.jsp	(.../importQuestionsXml.jsp)	(revision 21555f88fd0c63a4a9eb3ae288a2e1d48452aa4b)
+++ lams_central/web/qb/importQuestionsXml.jsp	(.../importQuestionsXml.jsp)	(revision f92b1383638a766c5d8496c6f607322dd2af8329)
@@ -3,55 +3,38 @@
 
 <%@ page import="org.lamsfoundation.lams.util.Configuration" %>
 <%@ page import="org.lamsfoundation.lams.util.ConfigurationKeys" %>
-<%@ page import="org.lamsfoundation.lams.util.FileValidatorUtil" %>
+<%@ page import="org.lamsfoundation.lams.util.FileUtil" %>
 <c:set var="UPLOAD_FILE_MAX_SIZE"><%=Configuration.get(ConfigurationKeys.UPLOAD_FILE_LARGE_MAX_SIZE)%></c:set>
-<c:set var="UPLOAD_FILE_MAX_SIZE_AS_USER_STRING"><%=FileValidatorUtil.formatSize(Configuration.getAsInt(ConfigurationKeys.UPLOAD_FILE_LARGE_MAX_SIZE))%></c:set>
-<c:set var="EXE_FILE_TYPES"><%=Configuration.get(ConfigurationKeys.EXE_EXTENSIONS)%></c:set>
+<c:set var="tmpFileUploadId"><%=FileUtil.generateTmpFileUploadId()%></c:set>
 
 <lams:html>
 <lams:head>
 	<title>x</title>
 	<lams:css/>
+	<link href="/lams/css/uppy.min.css" rel="stylesheet" type="text/css" />
 
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/bootstrap.min.js"></script>
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.form.js"></script>
-	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/upload.js"></script>
+	<script type="text/javascript" src="/lams/includes/javascript/uppy/uppy.min.js"></script>
+	<c:choose>
+		<c:when test="${language eq 'es'}">
+			<script type="text/javascript" src="/lams/includes/javascript/uppy/es_ES.min.js"></script>
+		</c:when>
+		<c:when test="${language eq 'fr'}">
+			<script type="text/javascript" src="/lams/includes/javascript/uppy/fr_FR.min.js"></script>
+		</c:when>
+		<c:when test="${language eq 'el'}">
+			<script type="text/javascript" src="/lams/includes/javascript/uppy/el_GR.min.js"></script>
+		</c:when>
+	</c:choose>
 	<script type="text/javascript">
 		function closeWin() {
 			window.close();
 		}
 
-		function isXML(filename) {
-			var extname = filename.substr((~-filename.lastIndexOf(".") >>> 0) + 2);
-			if ( extname.length > 0 ) {
-				extname = extname.toUpperCase();
-				extname = "." + extname;
-				return '.XML' === extname;
-			}
-			return false;
-		}
 		
-		function verifyAndSubmit() {
-			var fileSelect = document.getElementById('UPLOAD_FILE');
-			var files = fileSelect.files;
-			if (files.length == 0) {
-				clearFileError();
-				showFileError('<fmt:message key="button.select.importfile"/>');
-				return;
-			} else {
-				var file = files[0];
-				clearFileError();
-				if  ( ! isXML(file.name) ) {
-					showFileError('<fmt:message key="error.import.file.format"/>');
-					return;
-				} 
-				if ( ! validateShowErrorFileSize(file, '${UPLOAD_FILE_MAX_SIZE}', '<fmt:message key="errors.maxfilesize"/>') ) {
-					return;
-				}
-			}
-
-			document.getElementById('itemAttachment_Busy').style.display = '';
+		function submit() {
 			var options = { 
 				target:  parent.jQuery('#itemArea'), 
 				success: function (responseText, statusText) {  // post-submit callback 
@@ -60,7 +43,69 @@
 	    	}; 							
 	    	$('#importForm').ajaxSubmit(options);
 		}
+		/**
+		 * Initialise Uppy as the file upload widget
+		 */
+		var LAMS_URL = '<lams:LAMSURL/>',
+	 		UPLOAD_FILE_MAX_SIZE = '<c:out value="${UPLOAD_FILE_MAX_SIZE}"/>';
 			
+		function initFileUpload(tmpFileUploadId, language) {
+			  var uppyProperties = {
+				  // upload immediately 
+				  autoProceed: true,
+				  allowMultipleUploads: true,
+				  debug: false,
+				  restrictions: {
+					// taken from LAMS configuration
+				    maxFileSize: +UPLOAD_FILE_MAX_SIZE,
+				    maxNumberOfFiles: 1,
+				    allowedFileTypes : ['.xml']
+				  },
+				  meta: {
+					  // all uploaded files go to this subdir in LAMS tmp dir
+					  // its format is: upload_<userId>_<timestamp>
+					  'tmpFileUploadId' : tmpFileUploadId,
+					  'largeFilesAllowed' : true
+				  }
+			  };
+			  
+			  switch(language) {
+			  	case 'es' : uppyProperties.locale = Uppy.locales.es_ES; break; 
+				case 'fr' : uppyProperties.locale = Uppy.locales.fr_FR; break; 
+				case 'el' : uppyProperties.locale = Uppy.locales.el_GR; break; 
+			  }
+			  
+			  
+			  // global variable
+			  uppy = Uppy.Core(uppyProperties);
+			  // upload using Ajax
+			  uppy.use(Uppy.XHRUpload, {
+				  endpoint: LAMS_URL + 'tmpFileUpload',
+				  fieldName : 'file',
+				  // files are uploaded one by one
+				  limit : 1
+			  });
+			  
+			  uppy.use(Uppy.DragDrop, {
+				  target: '#image-upload-area',
+				  inline: true,
+				  height: 120,
+				  width: '100%'
+				});
+			  
+			  uppy.use(Uppy.StatusBar, {
+				  target: '#image-upload-area',
+				  hideAfterFinish: false,
+				  hideUploadButton: true,
+				  hideRetryButton: true,
+				  hidePauseResumeButton: true,
+				  hideCancelButton: true
+				});
+		}
+		
+		$(document).ready(function(){
+			initFileUpload('${tmpFileUploadId}', '<lams:user property="localeLanguage"/>');
+		});	
 	</script>
 </lams:head>
 
@@ -76,18 +121,17 @@
 		<div class="panel-body">
 			<c:set var="csrfToken"><csrf:token/></c:set>
 			<form action="<c:url value="/xmlQuestions/importQuestionsXml.do"/>?${csrfToken}&collectionUid=${param.collectionUid}" method="post" 
-				enctype="multipart/form-data" id="importForm">	
+				id="importForm">	
+				<input type="hidden" name="tmpFileUploadId" value="${tmpFileUploadId}" /> 
 				
-				<lams:FileUpload fileFieldname="UPLOAD_FILE" fileInputMessageKey="label.file" 
-					uploadInfoMessageKey="msg.import.file.format" maxFileSize="${UPLOAD_FILE_MAX_SIZE_AS_USER_STRING}"/>
-
-				<lams:WaitingSpinner id="itemAttachment_Busy"/>
 			
+				<div id="image-upload-area" class="voffset20"></div>
+			
 				<div class="pull-right voffset10" id="buttonsDiv">
 					<input class="btn btn-sm btn-default" value='<fmt:message key="button.cancel"/>' type="button"
 						onClick="javascript:self.parent.tb_remove();" />
 
-					<a href="#nogo" class="btn btn-sm btn-primary" onclick="javascript:verifyAndSubmit();">
+					<a href="#nogo" class="btn btn-sm btn-primary" onclick="javascript:submit();">
 						<i class="fa fa-sm fa-upload"></i>&nbsp;<fmt:message key="button.import" />
 					</a>
 				</div>