Index: lams_central/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r7067bfdadf476c8032a38071ec7d431bb87dd281 -r9846a1d61f34b45ba6db0e6a7daf2a620e607c83
--- lams_central/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 7067bfdadf476c8032a38071ec7d431bb87dd281)
+++ lams_central/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 9846a1d61f34b45ba6db0e6a7daf2a620e607c83)
@@ -335,6 +335,7 @@
 label.questions.choice.title  =Choose questions
 label.questions.choice.select.all  =Select all
 label.questions.choice.missing  =Please check at least one question.
+label.questions.choice.collection =Choose a collection:
 index.single.activity.lesson.title  =Add single activity lesson
 index.single.activity.lesson.desc  =or one-click activity:
 label.disable.lesson.sorting  =Disable lesson sorting
Index: lams_central/src/java/org/lamsfoundation/lams/web/QuestionsController.java
===================================================================
diff -u -r3f18890e24de43c31ac23d49e2c1a4906e479863 -r9846a1d61f34b45ba6db0e6a7daf2a620e607c83
--- lams_central/src/java/org/lamsfoundation/lams/web/QuestionsController.java	(.../QuestionsController.java)	(revision 3f18890e24de43c31ac23d49e2c1a4906e479863)
+++ lams_central/src/java/org/lamsfoundation/lams/web/QuestionsController.java	(.../QuestionsController.java)	(revision 9846a1d61f34b45ba6db0e6a7daf2a620e607c83)
@@ -7,13 +7,18 @@
 import java.util.TreeSet;
 
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
 
 import org.apache.commons.lang.StringUtils;
+import org.lamsfoundation.lams.qb.service.IQbService;
 import org.lamsfoundation.lams.questions.Question;
 import org.lamsfoundation.lams.questions.QuestionParser;
+import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
 import org.lamsfoundation.lams.util.Configuration;
 import org.lamsfoundation.lams.util.ConfigurationKeys;
 import org.lamsfoundation.lams.util.MessageService;
+import org.lamsfoundation.lams.web.session.SessionManager;
+import org.lamsfoundation.lams.web.util.AttributeNames;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Controller;
@@ -31,11 +36,15 @@
 
     @Autowired
     @Qualifier("centralMessageService")
-    MessageService messageService;
+    private MessageService messageService;
 
+    @Autowired
+    private IQbService qbService;
+
     @RequestMapping("/questions")
     public String execute(@RequestParam(name = "file", required = false) MultipartFile file,
-	    @RequestParam String returnURL, @RequestParam("limitType") String limitTypeParam,  @RequestParam String callerID,
+	    @RequestParam String returnURL, @RequestParam("limitType") String limitTypeParam,
+	    @RequestParam String callerID, @RequestParam(defaultValue = "false") boolean collectionChoice,
 	    HttpServletRequest request) throws Exception {
 
 	String tempDirName = Configuration.get(ConfigurationKeys.LAMS_TEMP_DIR);
@@ -56,11 +65,15 @@
 
 	// this parameter is used by the authoring templates. TBL uses QTI import for both the Questions and Assessments tab
 	request.setAttribute("callerID", callerID);
-	
-	
+
 	// show only chosen types of questions
 	request.setAttribute("limitType", limitTypeParam);
 
+	if (collectionChoice) {
+	    // in the view a drop down with collections will be displayed
+	    request.setAttribute("collections", qbService.getUserCollections(QuestionsController.getUserId()));
+	}
+
 	// user did not choose a file
 	if ((uploadedFileStream == null) || !(packageName.endsWith(".zip") || packageName.endsWith(".xml"))) {
 	    MultiValueMap<String, String> errorMap = new LinkedMultiValueMap<>();
@@ -83,4 +96,10 @@
 
 	return "questions/questionChoice";
     }
+
+    private static Integer getUserId() {
+	HttpSession ss = SessionManager.getSession();
+	UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER);
+	return user != null ? user.getUserID() : null;
+    }
 }
\ No newline at end of file
Index: lams_central/src/java/org/lamsfoundation/lams/web/qb/ImsQtiController.java
===================================================================
diff -u -r59012f90b43cd586fcf9c6330ebd1f20435811c8 -r9846a1d61f34b45ba6db0e6a7daf2a620e607c83
--- lams_central/src/java/org/lamsfoundation/lams/web/qb/ImsQtiController.java	(.../ImsQtiController.java)	(revision 59012f90b43cd586fcf9c6330ebd1f20435811c8)
+++ lams_central/src/java/org/lamsfoundation/lams/web/qb/ImsQtiController.java	(.../ImsQtiController.java)	(revision 9846a1d61f34b45ba6db0e6a7daf2a620e607c83)
@@ -55,13 +55,14 @@
     /**
      * Parses questions extracted from IMS QTI file and adds them as new QB questions.
      */
-    @RequestMapping("/saveQTI")
+    @RequestMapping(path = "/saveQTI", produces = "text/plain")
     @ResponseBody
-    public void saveQTI(HttpServletRequest request, @RequestParam long collectionUid,
-	    @RequestParam String contentFolderID) throws UnsupportedEncodingException {
+    public String saveQTI(HttpServletRequest request, @RequestParam long collectionUid,
+	    @RequestParam(defaultValue = "") String contentFolderID) throws UnsupportedEncodingException {
 
 	Question[] questions = QuestionParser.parseQuestionChoiceForm(request);
 	Set<String> collectionUUIDs = null;
+	StringBuilder qbQuestionUidsString = new StringBuilder();
 
 	for (Question question : questions) {
 
@@ -335,10 +336,20 @@
 
 	    qbService.addQuestionToCollection(collectionUid, qbQuestion.getQuestionId(), false);
 
+	    qbQuestionUidsString.append(qbQuestion.getQuestionId()).append(',');
+
 	    if (log.isDebugEnabled()) {
 		log.debug("Imported QTI question. Name: " + qbQuestion.getName() + ", uid: " + qbQuestion.getUid());
 	    }
 	}
+
+	String qbQuestionUids = null;
+	if (qbQuestionUidsString.length() > 0 && qbQuestionUidsString.charAt(qbQuestionUidsString.length() - 1) == ',') {
+	    qbQuestionUids = qbQuestionUidsString.substring(0, qbQuestionUidsString.length() - 1);
+	} else {
+	    qbQuestionUids = qbQuestionUidsString.toString();
+	}
+	return qbQuestionUids;
     }
 
     /**
Index: lams_central/web/qb/collection.jsp
===================================================================
diff -u -r0b3c5ce0f18b9e4a4195dc8144dc02784c6e3997 -r9846a1d61f34b45ba6db0e6a7daf2a620e607c83
--- lams_central/web/qb/collection.jsp	(.../collection.jsp)	(revision 0b3c5ce0f18b9e4a4195dc8144dc02784c6e3997)
+++ lams_central/web/qb/collection.jsp	(.../collection.jsp)	(revision 9846a1d61f34b45ba6db0e6a7daf2a620e607c83)
@@ -376,7 +376,7 @@
 	    	var form = $($.parseHTML(formHTML));
 			$.ajax({
 				type: "POST",
-				url: '<c:url value="/imsqti/saveQTI.do" />?contentFolderID=${contentFolderID}&collectionUid=${collection.uid}',
+				url: '<c:url value="/imsqti/saveQTI.do" />?collectionUid=${collection.uid}',
 				data: form.serializeArray(),
 				success: function() {
 					location.reload();
Index: lams_central/web/questions/questionChoice.jsp
===================================================================
diff -u -ra9f95a26e562a58b55c99f2c18e253c151ef457a -r9846a1d61f34b45ba6db0e6a7daf2a620e607c83
--- lams_central/web/questions/questionChoice.jsp	(.../questionChoice.jsp)	(revision a9f95a26e562a58b55c99f2c18e253c151ef457a)
+++ lams_central/web/questions/questionChoice.jsp	(.../questionChoice.jsp)	(revision 9846a1d61f34b45ba6db0e6a7daf2a620e607c83)
@@ -42,6 +42,10 @@
 		div#errorArea {
 			display: none;
 		}
+		
+		#collectionSelect {
+			float: right;
+		}
 	</style>
 	<script type="text/javascript" src="includes/javascript/jquery.js"></script>
 	<script type="text/javascript">
@@ -157,6 +161,20 @@
 	<form id="questionForm" method="POST">
 		<input type="hidden" name="questionCount" value="${fn:length(questions)}" />
 		
+		<c:if test="${not empty collections}">
+			<!-- Choose a collection where questions should be imported to -->
+			<label id="collectionSelect">
+				<fmt:message key="label.questions.choice.collection" />&nbsp;
+				<select name="collectionUid">
+					<c:forEach items="${collections}" var="collection">
+						<option value="${collection.uid}" ${empty collection.userId ? "selected" : ""}>
+							<c:out value="${collection.name}" />
+						</option>
+					</c:forEach>
+				</select>
+			</label>
+		</c:if>
+		
 		<c:forEach var="question" items="${questions}" varStatus="questionStatus">
 			<%-- Question itself --%>
 			<input id="question${questionStatus.index}" name="question${questionStatus.index}"
Index: lams_central/web/questions/questionFile.jsp
===================================================================
diff -u -r3f18890e24de43c31ac23d49e2c1a4906e479863 -r9846a1d61f34b45ba6db0e6a7daf2a620e607c83
--- lams_central/web/questions/questionFile.jsp	(.../questionFile.jsp)	(revision 3f18890e24de43c31ac23d49e2c1a4906e479863)
+++ lams_central/web/questions/questionFile.jsp	(.../questionFile.jsp)	(revision 9846a1d61f34b45ba6db0e6a7daf2a620e607c83)
@@ -64,6 +64,7 @@
 				<input type="hidden" name="returnURL" value="${empty param.returnURL ? returnURL : param.returnURL}" /> 
 				<input type="hidden" name="callerID" value="${empty param.callerID ? callerID : param.callerID}" /> 
 				<input type="hidden" name="limitType" value="${empty param.limitType ? limitType : param.limitType}" /> 
+				<input type="hidden" name="collectionChoice" value="${empty param.collectionChoice ? collectionChoice : param.collectionChoice}" /> 
 				<lams:FileUpload fileFieldname="file" fileInputMessageKey="label.file" maxFileSize="${UPLOAD_FILE_MAX_SIZE_AS_USER_STRING}"/>
 				<lams:WaitingSpinner id="itemAttachment_Busy"/>
 				<div class="pull-right voffset5" id="buttonsDiv">
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/McController.java
===================================================================
diff -u -r33aeeae9d9764b3411e04a48ee165e526c240f44 -r9846a1d61f34b45ba6db0e6a7daf2a620e607c83
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/McController.java	(.../McController.java)	(revision 33aeeae9d9764b3411e04a48ee165e526c240f44)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/McController.java	(.../McController.java)	(revision 9846a1d61f34b45ba6db0e6a7daf2a620e607c83)
@@ -34,6 +34,7 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
 import org.lamsfoundation.lams.qb.model.QbOption;
 import org.lamsfoundation.lams.qb.model.QbQuestion;
@@ -440,6 +441,19 @@
 	return tempQuestionDtos;
     }
 
+    @RequestMapping(value = "/importQbQuestions", method = RequestMethod.POST)
+    private String importQbQuestions(HttpServletRequest request, @RequestParam String sessionMapId,
+	    @RequestParam String qbQuestionUids) {
+	// get a list of QB question UIDs and add each of them to the activity
+	// this happens on QTI import
+	for (String qbQuestionUid : qbQuestionUids.split(",")) {
+	    if (StringUtils.isNotBlank(qbQuestionUid)) {
+		importQbQuestion(request, sessionMapId, Long.valueOf(qbQuestionUid));
+	    }
+	}
+	return "authoring/itemlist";
+    }
+
     /**
      * Adds QbQuestion, selected in the questionDescription bank, to the current questionDescription list.
      */
@@ -451,7 +465,7 @@
 		.getAttribute(sessionMapId);
 	request.setAttribute(McAppConstants.ATTR_SESSION_MAP_ID, sessionMapId);
 	List<McQuestionDTO> questionDtos = (List<McQuestionDTO>) sessionMap.get(McAppConstants.QUESTION_DTOS);
-	
+
 	//check whether this QB question is a duplicate
 	for (McQuestionDTO questionDto : questionDtos) {
 	    if (qbQuestionUid.equals(questionDto.getQbQuestionUid())) {
@@ -493,7 +507,7 @@
 
 	return "authoring/itemlist";
     }
-    
+
     /**
      * Shows "This question has already been added" error message in a browser.
      */
Index: lams_tool_lamc/web/authoring/BasicContent.jsp
===================================================================
diff -u -rd064905749470c0f9d9ffd8b7d8614529d533a88 -r9846a1d61f34b45ba6db0e6a7daf2a620e607c83
--- lams_tool_lamc/web/authoring/BasicContent.jsp	(.../BasicContent.jsp)	(revision d064905749470c0f9d9ffd8b7d8614529d533a88)
+++ lams_tool_lamc/web/authoring/BasicContent.jsp	(.../BasicContent.jsp)	(revision 9846a1d61f34b45ba6db0e6a7daf2a620e607c83)
@@ -51,6 +51,41 @@
 	function refreshThickbox(){
 		tb_init('a.thickbox, area.thickbox, input.thickbox');//pass where to apply thickbox
 	};
+	
+  	function importQTI(){
+  		// open a pop up with filtered questions and a collection choice
+    	window.open('<lams:LAMSURL />questions/questionFile.jsp?limitType=mc&collectionChoice=true',
+    			    'QuestionFile','width=500,height=240,scrollbars=yes');
+    }
+  	
+  	// this method is called by QTI questionChoice.jsp 
+    function saveQTI(formHTML, formName) {
+    	var form = $($.parseHTML(formHTML));
+    	// first, save questions in the QB
+		$.ajax({
+			type: "POST",
+			url: '<lams:LAMSURL />imsqti/saveQTI.do',
+			data: form.serializeArray(),
+			dataType: 'text',
+			// the response is a comma-delimited list of QB question UIDs, for example 4,5,65 
+			success: function(qbQuestionUids) {
+				$.ajax({
+					type: "POST",
+					url: '<lams:WebAppURL />authoring/importQbQuestions.do',
+					data: {
+						// send QB question uids to MCQ authoring controller
+						'qbQuestionUids' : qbQuestionUids,
+						'sessionMapId'   : '${sessionMapId}'
+					},
+					dataType: 'html',
+					success: function(response) {
+						// question list gets refreshed
+						$('#itemArea').html(response);
+					}
+				});
+			}
+		});
+    }
 </script>
 
 <input type="hidden" name="questionIndex" />
Index: lams_tool_lamc/web/authoring/itemlist.jsp
===================================================================
diff -u -ra9f95a26e562a58b55c99f2c18e253c151ef457a -r9846a1d61f34b45ba6db0e6a7daf2a620e607c83
--- lams_tool_lamc/web/authoring/itemlist.jsp	(.../itemlist.jsp)	(revision a9f95a26e562a58b55c99f2c18e253c151ef457a)
+++ lams_tool_lamc/web/authoring/itemlist.jsp	(.../itemlist.jsp)	(revision 9846a1d61f34b45ba6db0e6a7daf2a620e607c83)
@@ -36,9 +36,6 @@
 					<fmt:message key="label.authoring.import.qti" />
 				</a>
 			</c:if>
-			<a href="#nogo" onClick="javascript:exportQTI()" class="btn btn-default" id="exportQTI">
-				<fmt:message key="label.authoring.export.qti" />
-			</a>
 		</div>
 	</div>