Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java
===================================================================
diff -u -r49b072598933566cedd795667351678071f03004 -r3a64b2f8137870eb67586cd9b18e71f84096b43c
--- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java	(.../ImageGalleryServiceImpl.java)	(revision 49b072598933566cedd795667351678071f03004)
+++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java	(.../ImageGalleryServiceImpl.java)	(revision 3a64b2f8137870eb67586cd9b18e71f84096b43c)
@@ -940,7 +940,6 @@
     }
 
     @Override
-    @SuppressWarnings("unchecked")
     public void removeLearnerContent(Long toolContentId, Integer userId) throws ToolException {
 	if (ImageGalleryServiceImpl.log.isDebugEnabled()) {
 	    ImageGalleryServiceImpl.log.debug(
Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/controller/LearningController.java
===================================================================
diff -u -r49b072598933566cedd795667351678071f03004 -r3a64b2f8137870eb67586cd9b18e71f84096b43c
--- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/controller/LearningController.java	(.../LearningController.java)	(revision 49b072598933566cedd795667351678071f03004)
+++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/controller/LearningController.java	(.../LearningController.java)	(revision 3a64b2f8137870eb67586cd9b18e71f84096b43c)
@@ -23,13 +23,15 @@
 
 package org.lamsfoundation.lams.tool.imageGallery.web.controller;
 
+import java.io.File;
 import java.io.IOException;
 import java.sql.Timestamp;
 import java.util.Date;
 import java.util.Iterator;
 import java.util.Set;
 import java.util.TreeSet;
 
+import javax.servlet.ServletException;
 import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -56,6 +58,7 @@
 import org.lamsfoundation.lams.tool.imageGallery.web.form.ImageRatingForm;
 import org.lamsfoundation.lams.tool.imageGallery.web.form.ReflectionForm;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
+import org.lamsfoundation.lams.util.FileUtil;
 import org.lamsfoundation.lams.util.MessageService;
 import org.lamsfoundation.lams.util.WebUtil;
 import org.lamsfoundation.lams.web.session.SessionManager;
@@ -250,9 +253,6 @@
     public String saveNewImage(@ModelAttribute ImageGalleryItemForm imageGalleryItemForm, HttpServletRequest request,
 	    HttpServletResponse response) throws IOException {
 
-	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession()
-		.getAttribute(imageGalleryItemForm.getSessionMapID());
-
 	MultiValueMap<String, String> errorMap = new LinkedMultiValueMap<>();
 
 	try {
@@ -272,7 +272,7 @@
 		sb.append(pair.getKey() + " " + pair.getValue());
 	    }
 	    outputStream.print(sb.toString());
-	    response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
+	    response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, sb.toString());
 	}
 
 	return null;
@@ -488,6 +488,7 @@
     /**
      * Extract web form content to imageGallery item.
      */
+    @SuppressWarnings("unchecked")
     private void extractFormToImageGalleryItem(HttpServletRequest request, ImageGalleryItemForm imageForm)
 	    throws Exception {
 	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession()
@@ -511,18 +512,22 @@
 	ImageGalleryItem image = new ImageGalleryItem();
 	image.setCreateDate(new Timestamp(new Date().getTime()));
 
-	// upload ImageGalleryItem file
-	// and setting file properties' fields: item.setFileUuid();
-	// item.setFileName();
-//	if (imageForm.getFile() != null) {
-//	    try {
-//		igService.uploadImageGalleryItemFile(image, imageForm.getFile());
-//	    } catch (UploadImageGalleryFileException e) {
-//		// remove new image!
-//		throw e;
-//	    }
-//	}
+	File uploadDir = FileUtil.getTmpFileUploadDir(imageForm.getTmpFileUploadId());
+	if (uploadDir.canRead()) {
+	    File[] files = uploadDir.listFiles();
+	    if (files.length == 0) {
+		throw new ServletException("No image uploaded");
+	    }
 
+	    if (files.length > 1) {
+		throw new ServletException("Uploaded more than 1 image while editing an Image Gallery Item");
+	    }
+
+	    igService.uploadImageGalleryItemFile(image, files[0]);
+	} else {
+	    throw new ServletException("Can not access upload dir");
+	}
+
 	String title = imageForm.getTitle();
 	if (StringUtils.isBlank(title)) {
 	    Long nextImageTitleNumber = imageGallery.getNextImageTitle();
@@ -534,11 +539,8 @@
 
 	image.setCreateBy(user);
 	image.setDescription(imageForm.getDescription());
-	image.setCreateByAuthor(false);
+	image.setCreateByAuthor(mode.isTeacher());
 	image.setHide(false);
-	if (mode.isTeacher()) {
-	    image.setCreateByAuthor(true);
-	}
 
 	// setting SequenceId
 	Set<ImageGalleryItem> imageList = imageGallery.getImageGalleryItems();
Index: lams_tool_images/web/includes/javascript/imageGalleryitem.js
===================================================================
diff -u -rc839b727cb9a2257b2545ea8c12dc0062548446d -r3a64b2f8137870eb67586cd9b18e71f84096b43c
--- lams_tool_images/web/includes/javascript/imageGalleryitem.js	(.../imageGalleryitem.js)	(revision c839b727cb9a2257b2545ea8c12dc0062548446d)
+++ lams_tool_images/web/includes/javascript/imageGalleryitem.js	(.../imageGalleryitem.js)	(revision 3a64b2f8137870eb67586cd9b18e71f84096b43c)
@@ -50,7 +50,7 @@
     	},
     	error: function(jqXHR, textStatus, errorMessage) {
     		$('#uploadButtons').show();
-    		$('#itemAttachmentArea_Busy').hide();    		
+    		$('#itemAttachmentArea_Busy').hide();    
         	alert(errorMessage);
     	}
 	});
Index: lams_tool_images/web/pages/authoring/authoring.jsp
===================================================================
diff -u -rc839b727cb9a2257b2545ea8c12dc0062548446d -r3a64b2f8137870eb67586cd9b18e71f84096b43c
--- lams_tool_images/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision c839b727cb9a2257b2545ea8c12dc0062548446d)
+++ lams_tool_images/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 3a64b2f8137870eb67586cd9b18e71f84096b43c)
@@ -4,7 +4,6 @@
 <%@ page import="org.lamsfoundation.lams.util.Configuration" %>
 <%@ page import="org.lamsfoundation.lams.util.ConfigurationKeys" %>
 <%@ page import="org.lamsfoundation.lams.util.FileUtil" %>
-<%@ page import="org.lamsfoundation.lams.util.FileValidatorUtil" %>
 <c:set var="UPLOAD_FILE_LARGE_MAX_SIZE"><%=Configuration.get(ConfigurationKeys.UPLOAD_FILE_LARGE_MAX_SIZE)%></c:set>
 <c:set var="ALLOWED_EXTENSIONS_IMAGE"><%=FileUtil.ALLOWED_EXTENSIONS_IMAGE%></c:set>
 <c:set var="language"><lams:user property="localeLanguage"/></c:set>
@@ -21,12 +20,10 @@
 		<%-- used for  imageGalleryitem.js --%>
 		var LAMS_URL = '${lams}';
 		var removeItemAttachmentUrl = "<c:url value='/authoring/removeImageFile.do'/>";
-		var saveMultipleImagesUrl = "<c:url value='/authoring/saveMultipleImages.do'/>";
 		var UPLOAD_FILE_LARGE_MAX_SIZE = "${UPLOAD_FILE_LARGE_MAX_SIZE}";
 		// convert Java syntax to JSON
 		var UPLOAD_ALLOWED_EXTENSIONS = JSON.parse("[" + "${ALLOWED_EXTENSIONS_IMAGE}".replace(/\.\w+/g, '"$&"') + "]");
 		var LABEL_ITEM_BLANK = '<fmt:message key="error.resource.item.file.blank"/>';
-		var LABEL_MAX_FILE_SIZE = '<fmt:message key="errors.maxfilesize"/>';
 		var LABEL_NOT_ALLOWED_FORMAT = '<fmt:message key="error.resource.image.not.alowed.format"/>';
 	</script>
 	<script type="text/javascript" src="<lams:WebAppURL/>includes/javascript/imageGalleryitem.js"></script>
Index: lams_tool_images/web/pages/authoring/parts/imagefile.jsp
===================================================================
diff -u -rc839b727cb9a2257b2545ea8c12dc0062548446d -r3a64b2f8137870eb67586cd9b18e71f84096b43c
--- lams_tool_images/web/pages/authoring/parts/imagefile.jsp	(.../imagefile.jsp)	(revision c839b727cb9a2257b2545ea8c12dc0062548446d)
+++ lams_tool_images/web/pages/authoring/parts/imagefile.jsp	(.../imagefile.jsp)	(revision 3a64b2f8137870eb67586cd9b18e71f84096b43c)
@@ -21,5 +21,5 @@
 <input type="hidden" name="tmpFileUploadId" value="${imageGalleryItemForm.tmpFileUploadId}" />
 <div id="image-upload-area" class="voffset20"></div>
 <script>
-	initFileUpload('${imageGalleryItemForm.tmpFileUploadId}', ${itemAttachment.hasFile}, '<lams:user property="localeLanguage"/>');
+	initFileUpload('${imageGalleryItemForm.tmpFileUploadId}', ${itemAttachment.hasFile or saveUsingLearningAction}, '<lams:user property="localeLanguage"/>');
 </script>
Index: lams_tool_images/web/pages/learning/learning.jsp
===================================================================
diff -u -r3bb7e0141ae1cc15ccd737c95d90b5762a34ad61 -r3a64b2f8137870eb67586cd9b18e71f84096b43c
--- lams_tool_images/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 3bb7e0141ae1cc15ccd737c95d90b5762a34ad61)
+++ lams_tool_images/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 3a64b2f8137870eb67586cd9b18e71f84096b43c)
@@ -2,6 +2,7 @@
 <%@ include file="/common/taglibs.jsp"%>
 <%@ page import="org.lamsfoundation.lams.util.Configuration" %>
 <%@ page import="org.lamsfoundation.lams.util.ConfigurationKeys" %>
+<%@ page import="org.lamsfoundation.lams.util.FileUtil" %>
 
 <%-- param has higher level for request attribute --%>
 <c:if test="${not empty param.sessionMapID}">
@@ -17,6 +18,8 @@
 		<c:set var="UPLOAD_FILE_MAX_SIZE"><%=Configuration.get(ConfigurationKeys.UPLOAD_FILE_LARGE_MAX_SIZE)%></c:set>
 	</c:otherwise>
 </c:choose>
+<c:set var="ALLOWED_EXTENSIONS_IMAGE"><%=FileUtil.ALLOWED_EXTENSIONS_IMAGE%></c:set>
+<c:set var="language"><lams:user property="localeLanguage"/></c:set>
 
 <lams:html>
 <lams:head>
@@ -38,16 +41,30 @@
     <lams:css suffix="jquery.jRating"/>
 	<link rel="stylesheet" type="text/css" href="${lams}css/jquery.tablesorter.theme-blue.css">
 	<link rel="stylesheet" type="text/css" href="${lams}css/jquery.tablesorter.pager.css">
+	<link href="${lams}css/uppy.min.css" rel="stylesheet" type="text/css" />
     
     <script type="text/javascript">
 		<%-- used for  imageGalleryitem.js --%>
-		var saveMultipleImagesUrl = "<c:url value='/learning/saveMultipleImages.do'/>";
 		var UPLOAD_FILE_LARGE_MAX_SIZE = "${UPLOAD_FILE_MAX_SIZE}";
+		// convert Java syntax to JSON
+		var UPLOAD_ALLOWED_EXTENSIONS = JSON.parse("[" + "${ALLOWED_EXTENSIONS_IMAGE}".replace(/\.\w+/g, '"$&"') + "]");
 		var LABEL_ITEM_BLANK = '<fmt:message key="error.resource.item.file.blank"/>';
-		var LABEL_MAX_FILE_SIZE = '<fmt:message key="errors.maxfilesize"><param>{0}</param></fmt:message>';
-		var LABEL_NOT_ALLOWED_FORMAT = '<fmt:message key="error.resource.image.not.alowed.format"/>';
 	</script>
 	<script type="text/javascript" src="<lams:WebAppURL/>includes/javascript/imageGalleryitem.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" src="<lams:WebAppURL/>includes/javascript/uploadImageLearning.js"></script>
     <script type="text/javascript" src="${lams}includes/javascript/upload.js"></script>
  	<script type="text/javascript" src="${lams}includes/javascript/jquery.form.js"></script>
Index: lams_tool_images/web/pages/monitoring/monitoring.jsp
===================================================================
diff -u -r7e1926a1f28d55c8de63720fbc97f918de5cc711 -r3a64b2f8137870eb67586cd9b18e71f84096b43c
--- lams_tool_images/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision 7e1926a1f28d55c8de63720fbc97f918de5cc711)
+++ lams_tool_images/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision 3a64b2f8137870eb67586cd9b18e71f84096b43c)
@@ -3,6 +3,7 @@
 <%@ page import="org.lamsfoundation.lams.tool.imageGallery.ImageGalleryConstants"%>
 <%@ page import="org.lamsfoundation.lams.util.Configuration" %>
 <%@ page import="org.lamsfoundation.lams.util.ConfigurationKeys" %>
+<%@ page import="org.lamsfoundation.lams.util.FileUtil" %>
 
 <c:set var="sessionMap" value="${sessionScope[sessionMapID]}"/>
 <c:choose>
@@ -13,6 +14,8 @@
 		<c:set var="UPLOAD_FILE_MAX_SIZE"><%=Configuration.get(ConfigurationKeys.UPLOAD_FILE_LARGE_MAX_SIZE)%></c:set>
 	</c:otherwise>
 </c:choose>
+<c:set var="ALLOWED_EXTENSIONS_IMAGE"><%=FileUtil.ALLOWED_EXTENSIONS_IMAGE%></c:set>
+<c:set var="language"><lams:user property="localeLanguage"/></c:set>
 
 <lams:html>
 	<lams:head>
@@ -25,6 +28,7 @@
 		<lams:css suffix="jquery.jRating"/>
 		<link href="${lams}css/jquery.tablesorter.theme.bootstrap.css" rel="stylesheet" >
 		<link rel="stylesheet" href="${lams}css/jquery.tablesorter.pager.css">
+		<link href="${lams}css/uppy.min.css" rel="stylesheet" type="text/css" />
 		<style media="screen,projection" type="text/css">
 			.tablesorter,.tablesorter tr {
 				border: 1px solid #ddd;
@@ -57,13 +61,26 @@
 			WARN_MIN_NUMBER_WORDS_LABEL = '';
 
 			<%-- used for  imageGalleryitem.js --%>
-			var saveMultipleImagesUrl = "<c:url value='/learning/saveMultipleImages.do'/>";
 			var UPLOAD_FILE_LARGE_MAX_SIZE = "${UPLOAD_FILE_MAX_SIZE}";
+			// convert Java syntax to JSON
+			var UPLOAD_ALLOWED_EXTENSIONS = JSON.parse("[" + "${ALLOWED_EXTENSIONS_IMAGE}".replace(/\.\w+/g, '"$&"') + "]");
 			var LABEL_ITEM_BLANK = '<fmt:message key="error.resource.item.file.blank"/>';
-			var LABEL_MAX_FILE_SIZE = '<fmt:message key="errors.maxfilesize"><param>{0}</param></fmt:message>';
-			var LABEL_NOT_ALLOWED_FORMAT = '<fmt:message key="error.resource.image.not.alowed.format"/>';
 		</script>
 		<script type="text/javascript" src="<lams:WebAppURL />includes/javascript/imageGalleryitem.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" src="<lams:WebAppURL />includes/javascript/uploadImageLearning.js"></script>
     	<script type="text/javascript" src="${lams}includes/javascript/upload.js"></script>
  		<script type="text/javascript" src="${lams}includes/javascript/thickbox.js"></script>