Index: lams_central/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -r427b1699f540858bcf2d07288f0f5be431e8881b -r72c9800d4076fa450caff0943dd4de41399c83e0
--- lams_central/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 427b1699f540858bcf2d07288f0f5be431e8881b)
+++ lams_central/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 72c9800d4076fa450caff0943dd4de41399c83e0)
@@ -880,4 +880,13 @@
 authoring.tbl.desc.ae  =State the questions for AE. Click "Create Question" to add more questions.
 
 
+label.question.type.multiple.choice  =Multiple choice
+label.question.type.matching.pairs  =Matching pairs
+label.question.type.short.answer  =Short answer
+label.question.type.numerical  =Numerical
+label.question.type.true.false  =True/False
+label.question.type.essay  =Essay
+label.question.type.ordering  =Ordering
+label.question.type.mark.hedging  =Mark hedging
+
 #======= End labels: Exported 872 labels for en AU =====
Index: lams_central/src/java/org/lamsfoundation/lams/web/controller/SearchQBController.java
===================================================================
diff -u -ra109b7b66649bbed86abf584a192c6af194946ef -r72c9800d4076fa450caff0943dd4de41399c83e0
--- lams_central/src/java/org/lamsfoundation/lams/web/controller/SearchQBController.java	(.../SearchQBController.java)	(revision a109b7b66649bbed86abf584a192c6af194946ef)
+++ lams_central/src/java/org/lamsfoundation/lams/web/controller/SearchQBController.java	(.../SearchQBController.java)	(revision 72c9800d4076fa450caff0943dd4de41399c83e0)
@@ -23,67 +23,26 @@
 
 package org.lamsfoundation.lams.web.controller;
 
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import java.sql.Timestamp;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedHashSet;
-import java.util.LinkedList;
 import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.SortedSet;
-import java.util.TreeSet;
 
-import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.apache.commons.beanutils.PropertyUtils;
 import org.apache.commons.lang.StringUtils;
-import org.apache.commons.lang.math.NumberUtils;
 import org.apache.log4j.Logger;
-import org.lamsfoundation.lams.learningdesign.ToolActivity;
-import org.lamsfoundation.lams.lesson.Lesson;
-import org.lamsfoundation.lams.qb.model.QbOption;
 import org.lamsfoundation.lams.qb.model.QbQuestion;
 import org.lamsfoundation.lams.qb.service.IQbService;
-import org.lamsfoundation.lams.questions.Answer;
-import org.lamsfoundation.lams.questions.Question;
-import org.lamsfoundation.lams.questions.QuestionExporter;
-import org.lamsfoundation.lams.questions.QuestionParser;
 import org.lamsfoundation.lams.tool.Tool;
 import org.lamsfoundation.lams.tool.ToolAccessMode;
-import org.lamsfoundation.lams.tool.ToolAdapterContentManager;
 import org.lamsfoundation.lams.tool.ToolContent;
-import org.lamsfoundation.lams.tool.ToolContentManager;
 import org.lamsfoundation.lams.tool.exception.DataMissingException;
-import org.lamsfoundation.lams.tool.exception.ToolException;
-import org.lamsfoundation.lams.tool.service.LamsCoreToolService;
-import org.lamsfoundation.lams.usermanagement.Organisation;
-import org.lamsfoundation.lams.usermanagement.Role;
-import org.lamsfoundation.lams.usermanagement.User;
 import org.lamsfoundation.lams.usermanagement.service.IUserManagementService;
-import org.lamsfoundation.lams.util.CentralConstants;
 import org.lamsfoundation.lams.util.CommonConstants;
-import org.lamsfoundation.lams.util.MessageService;
 import org.lamsfoundation.lams.util.WebUtil;
 import org.lamsfoundation.lams.web.util.AttributeNames;
-import org.lamsfoundation.lams.web.util.SessionMap;
-import org.springframework.beans.factory.NoSuchBeanDefinitionException;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Controller;
-import org.springframework.util.MultiValueMap;
-import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.util.HtmlUtils;
 
@@ -126,18 +85,41 @@
 	Tool tool = toolContent.getTool();
 	String toolSignature = tool.getToolSignature();
 
-	int questionType;
-	boolean questionTypeHidden;
+	//empty questionTypesAvailable means no other questionTypes available for this tool
+	StringBuilder questionTypesAvailable = new StringBuilder(); 
+	//by default show MCQ type of questions (except for Q&A tool)
+	int questionTypeDefault = QbQuestion.TYPE_MULTIPLE_CHOICE_SINGLE_ANSWER;
 	if (CommonConstants.TOOL_SIGNATURE_SCRATCHIE.equals(toolSignature) || CommonConstants.TOOL_SIGNATURE_MCQ.equals(toolSignature)) {
-	    questionType = QbQuestion.TYPE_MULTIPLE_CHOICE_SINGLE_ANSWER;
-	    questionTypeHidden = true;
 	    
-	} else {
-	    questionType = 2;
-	    questionTypeHidden = false;
+	//CommonConstants.TOOL_SIGNATURE_SURVEY
+	} else if ("lasurv11".equals(toolSignature)) {
+	    questionTypesAvailable.append(QbQuestion.TYPE_MULTIPLE_CHOICE_SINGLE_ANSWER);
+	    questionTypesAvailable.append(",");
+	    questionTypesAvailable.append(QbQuestion.TYPE_ESSAY);
+	    
+	} else if (CommonConstants.TOOL_SIGNATURE_ASSESSMENT.equals(toolSignature)) {
+	    questionTypesAvailable.append(QbQuestion.TYPE_MULTIPLE_CHOICE_SINGLE_ANSWER);
+	    questionTypesAvailable.append(",");
+	    questionTypesAvailable.append(QbQuestion.TYPE_MATCHING_PAIRS);
+	    questionTypesAvailable.append(",");
+	    questionTypesAvailable.append(QbQuestion.TYPE_SHORT_ANSWER);
+	    questionTypesAvailable.append(",");
+	    questionTypesAvailable.append(QbQuestion.TYPE_NUMERICAL);
+	    questionTypesAvailable.append(",");
+	    questionTypesAvailable.append(QbQuestion.TYPE_TRUE_FALSE);
+	    questionTypesAvailable.append(",");
+	    questionTypesAvailable.append(QbQuestion.TYPE_ESSAY);
+	    questionTypesAvailable.append(",");
+	    questionTypesAvailable.append(QbQuestion.TYPE_ORDERING);
+	    questionTypesAvailable.append(",");
+	    questionTypesAvailable.append(QbQuestion.TYPE_MARK_HEDGING);
+	   
+	//CommonConstants.TOOL_SIGNATURE_QA
+	} else if ("laqa11".equals(toolSignature)) {
+	    questionTypeDefault = QbQuestion.TYPE_ESSAY;
 	}
-	request.setAttribute("questionType", questionType);
-	request.setAttribute("questionTypeHidden", questionTypeHidden);
+	request.setAttribute("questionType", questionTypeDefault);
+	request.setAttribute("questionTypesAvailable", questionTypesAvailable.toString());
 	
 	return "qb/search";
     }
@@ -181,8 +163,9 @@
 
 	    ArrayNode questionData = JsonNodeFactory.instance.arrayNode();
 	    questionData.add(question.getUid());
-	    questionData.add(HtmlUtils.htmlEscape(question.getName()));
-	    String description = question.getDescription() == null ? "" : question.getDescription().replaceAll("\\<.*?\\>", "");
+	    String title = question.getName() == null ? "" : question.getName().replaceAll("\\<.*?\\>", "").replaceAll("\\n", " ").trim();
+	    questionData.add(HtmlUtils.htmlEscape(title));
+	    String description = question.getDescription() == null ? "" : question.getDescription().replaceAll("\\<.*?\\>", "").trim();
 	    questionData.add(HtmlUtils.htmlEscape(description));
 
 	    ObjectNode userRow = JsonNodeFactory.instance.objectNode();
@@ -208,6 +191,9 @@
 	QbQuestion qbQuestion = (QbQuestion) userManagementService.findById(QbQuestion.class, questionUid);
 	request.setAttribute("question", qbQuestion);
 	
+	List<QbQuestion> otherVersions = qbService.getQbQuestionsByQuestionId(qbQuestion.getQuestionId());
+	request.setAttribute("otherVersions", otherVersions);
+	
 	return "qb/qbQuestionDetails";
     }
     
Index: lams_central/web/qb/qbQuestionDetails.jsp
===================================================================
diff -u -r3ec7cbf6d6a62b79ba7e4334d770721f8867e999 -r72c9800d4076fa450caff0943dd4de41399c83e0
--- lams_central/web/qb/qbQuestionDetails.jsp	(.../qbQuestionDetails.jsp)	(revision 3ec7cbf6d6a62b79ba7e4334d770721f8867e999)
+++ lams_central/web/qb/qbQuestionDetails.jsp	(.../qbQuestionDetails.jsp)	(revision 72c9800d4076fa450caff0943dd4de41399c83e0)
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8" %>
 <%@ taglib uri="tags-lams" prefix="lams" %>
+<%@ taglib uri="tags-function" prefix="fn" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
@@ -9,12 +10,39 @@
 <div class="panel-body">
 	<input type="hidden" id="selected-question-uid" value="${question.uid}">
 	
-	<div class="pull-right question-description" style="color: #969494">
-		Version: ${question.version}
+	<a id="import-button" class="btn btn-xs btn-default pull-right button-add-item" href="#nogo"
+		title="Import question from the question bank">
+		Import
+	</a>
+	
+	<div class="pull-right">
+		<c:choose>
+			<c:when test="${fn:length(otherVersions) == 1}">
+				<button class="btn btn-default btn-xs dropdown-toggle2" disabled="disabled">
+				    Version ${question.version}
+				</button>
+			</c:when>
+
+			<c:otherwise>
+				<div class="dropdown">
+					<button class="btn btn-default btn-xs dropdown-toggle" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+				    	Version ${question.version}&nbsp;<span class="caret"></span>
+					</button>
+					
+					<ul class="dropdown-menu" aria-labelledby="dropdownMenu1">
+						<c:forEach items="${otherVersions}" var="otherVersion">
+				    		<li <c:if test="${question.version == otherVersion.version}">class="disabled"</c:if>>
+				    			<a href="#nogo" onclick="javascript:loadQuestionDetailsArea(${otherVersion.uid});">Version ${otherVersion.version}</a>
+				    		</li>
+				    	</c:forEach>
+					</ul>
+				</div>			
+			</c:otherwise>
+		</c:choose>
 	</div>
 
 	<div class="">
-		<c:out value="${question.name}"/>
+		<c:out value="${question.name}" escapeXml="false"/>
 	</div>
 	
 	<div class="question-description">				
Index: lams_central/web/qb/search.jsp
===================================================================
diff -u -r3ec7cbf6d6a62b79ba7e4334d770721f8867e999 -r72c9800d4076fa450caff0943dd4de41399c83e0
--- lams_central/web/qb/search.jsp	(.../search.jsp)	(revision 3ec7cbf6d6a62b79ba7e4334d770721f8867e999)
+++ lams_central/web/qb/search.jsp	(.../search.jsp)	(revision 72c9800d4076fa450caff0943dd4de41399c83e0)
@@ -11,6 +11,7 @@
 	<lams:css />
 	<link type="text/css" href="<lams:LAMSURL/>css/free.ui.jqgrid.min.css" rel="stylesheet">
 	<link type="text/css" href="<lams:LAMSURL />gradebook/includes/css/gradebook.css" rel="stylesheet" />
+	
 	<style>
 		#grid-holder {
 		    padding-top: 15px;
@@ -21,6 +22,9 @@
     		overflow-x: hidden;
     		margin-top: 4px;
 		}
+		.question-title-grid {
+		    overflow-x: hidden;
+		}
 		
 		#close-button .fa {
 		    font-size: 16px;
@@ -31,7 +35,7 @@
 			box-shadow: none;
 		}
 		#import-button {
-			display: none;
+			margin-left: 5px;
 		}
 		#search-widgets {
 			display: flex;
@@ -78,10 +82,28 @@
 		    background-color: #FFFF88;
 		}
 		
-		#question-type {
+		.disabled-span {
 			-moz-user-select: none; -webkit-user-select: none; -ms-user-select:none; user-select:none;-o-user-select:none;
 		}
 		
+		.dropdown-menu {
+		    min-width: 90px;
+		}
+		
+		/* jqGrid header */
+		.ui-jqgrid .ui-jqgrid-htable .ui-jqgrid-labels th div {
+		    font-size: 14px;
+    		margin: 6px;
+		}
+		
+		/* question imported growl */
+		div.growlUI h1, div.growlUI h2 {
+			color: white;
+			margin: 5px 5px 5px 0px;
+			text-align: center;
+			font-size: 18px;
+		}
+		
 		/*----------STICKY FOOTER----------------*/
 		html {
 		    position: relative;
@@ -105,6 +127,7 @@
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/bootstrap.min.js"></script>
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/free.jquery.jqgrid.min.js"></script>
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.highlight.js"></script>
+	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.blockUI.js"></script>
 	<script type="text/javascript">
 		$(document).ready(function(){
 			
@@ -118,7 +141,6 @@
 			    pager: 'questions-grid-pager',
 			    rowList:[10,20,30,40,50,100],
 			    rowNum:10,
-			    viewrecords:true,
 			    guiStyle: "bootstrap",
 				iconSet: 'fontAwesome',
 			   	colNames:[
@@ -128,36 +150,26 @@
 				],
 			   	colModel:[
 			   		{name:'questionUid', index:'questionUid', width:0, hidden: true},
-			   		{name:'questionName', index:'questionName', width:570, search: true, searchoptions: { clearSearch: false }, formatter:userNameFormatter},
+			   		{name:'questionName', index:'questionName', width:570, search: true, searchoptions: { clearSearch: false }, formatter:questionNameFormatter},
 			   		{name:'questionDescription', index:'questionDescription', width:0, hidden: true}
 			   	],
-			  	onSelectRow: function(rowid) { 
-			  	    if(rowid == null) { 
-			  	    	rowid=0; 
-			  	    } 
+				onSelectRow: function(rowid, e) {
+				    //load up question details area
 			   		var questionUid = jQuery("#questions-grid").getCell(rowid, 'questionUid');
-
-		  	        $("#question-detail-area").show().load(
-		  	        	'<c:url value="/searchQB/displayQuestionDetails.do"/>',
-		  	        	{
-		  	        		questionUid: questionUid
-		  	       		},
-		  	       		function() {
-		  	       			$("#import-button").show();
-		  	       		}
-		  	       	);
-	  	  		},
+			   		loadQuestionDetailsArea(questionUid);
+				},
 		  	  	gridComplete: function () {
 			  	  	//highlight search results
 					if ($("#filter-questions").val()) {
 						$('>tbody>tr.jqgrow>td:nth-child(2)', this).highlight($("#filter-questions").val());
 					}
 				},
-			    loadError: function(xhr,st,err) {
+			    loadError: function(xhr,textStatus,errorThrown) {
 			    	$("#questions-grid").clearGridData();
-			    	$.jgrid.info_dialog.call("<fmt:message key="label.error"/>", "<fmt:message key="error.loaderror"/>", "<fmt:message key="label.ok"/>");
-			    	$("#import-button").hide();
 			    	$("#question-detail-area").hide().html("");
+
+			    	//display warning message
+			    	$(this).jqGrid("displayErrorMessage", "<fmt:message key="error.loaderror"/>");
 			    }
 			})
 			.navGrid("#questions-grid-pager", {edit:false,add:false,del:false,search:false});	
@@ -175,27 +187,39 @@
 	    	};
 
 	    	//handler for "Import" button
-	    	$("#import-button").on("click", function() {
-	    		var qbQuestionUid = $("#selected-question-uid").val();
+	    	$(document).on("click", '#import-button', function() {
+	    		//don't import if button is disabled 
+	    		if ($(this).is('[disabled=disabled]')) {
+	    			return;
+		    	}
+		    	//disabling the button
+	    		$(this).attr("disabled", "disabled");
 		    	
+		    	var qbQuestionUid = $("#selected-question-uid").val();
 	    		parent.jQuery("#itemArea").load(
 					"${param.returnUrl}",
 					{
 						qbQuestionUid: qbQuestionUid
 					},
 					function() {
-	    	    		self.parent.refreshThickbox()
-	    	    		self.parent.tb_remove();
+						//invoke refreshThickbox() only in case parent page has this method 
+						if (typeof self.parent.refreshThickbox === "function") {
+							self.parent.refreshThickbox();
+						}
+
+						//show successfull notification
+	                	$.growlUI('<i class="fa fa-lg fa-download"></i> Question successfully imported');
 					}
 				);
 	        });
 		});
 
 		//auxiliary formatter for jqGrid's question column
-		function userNameFormatter (cellvalue, options, rowObject) {
+		function questionNameFormatter (cellvalue, options, rowObject) {
 	       	var questionDescription = rowObject[2] ? rowObject[2] : "";
 
-	       	var text = cellvalue + "<div class='question-description-grid small'>";
+	       	var text = "<div class='question-title-grid'>" + cellvalue + "</div>";
+	       	text += "<div class='question-description-grid small'>";
 	       	if (questionDescription.length > 0) {
 	       		text += questionDescription;
 			}
@@ -222,9 +246,20 @@
 			).trigger('reloadGrid');
 
 		    $("#question-detail-area").hide("slow").html("");
-		    $("#import-button").hide("fast");
 	        //jQuery("#bigset").jqGrid('setGridParam',{url:"bigset.php?nm_mask="+nm_mask+"&cd_mask="+cd_mask,page:1}).trigger("reloadGrid");
 	    }
+
+		//load up question details area
+	    function loadQuestionDetailsArea(questionUid) {
+  	        $("#question-detail-area").show().load(
+	  	       	'<c:url value="/searchQB/displayQuestionDetails.do"/>',
+	  	       	{
+	  	       		questionUid: questionUid
+	  	    	},
+	  	    	function() {
+	  	    	}
+	  	    );
+		}
 	</script>
 </lams:head>
 <body>
@@ -244,7 +279,44 @@
 				<input type="text" id="filter-questions" class="form-control" placeholder="Contains text" 
 					onkeydown="doSearch(arguments[0]||event)" />
 		
-				<span id="question-type" class="form-control loffset5">Type: Multiple choice</span>
+				<c:if test="${!empty questionTypesAvailable}">
+					<span id="question-type" class="form-control loffset5 disabled-span">
+					Type:
+					<select id="questionType">
+						<c:forTokens items="${questionTypesAvailable}" delims="," var="questionTypeIter"></c:forTokens>
+  						<option value="${questionTypeIter}"
+  							<c:if test="${questionTypeIter == questionType}">selected="selected"</c:if>>
+  							
+							<c:choose>
+								<c:when test="${questionTypeIter == 1}">
+									<fmt:message key="label.question.type.multiple.choice" />
+								</c:when>
+								<c:when test="${questionTypeIter == 2}">
+									<fmt:message key="label.question.type.matching.pairs" />
+								</c:when>
+								<c:when test="${questionTypeIter == 3}">
+									<fmt:message key="label.question.type.short.answer" />
+								</c:when>
+								<c:when test="${questionTypeIter == 4}">
+									<fmt:message key="label.question.type.numerical" />
+								</c:when>
+								<c:when test="${questionTypeIter == 5}">
+									<fmt:message key="label.question.type.true.false" />
+								</c:when>
+								<c:when test="${questionTypeIter == 6}">
+									<fmt:message key="label.question.type.essay" />
+								</c:when>
+								<c:when test="${questionTypeIter == 7}">
+									<fmt:message key="label.question.type.ordering" />
+								</c:when>
+								<c:when test="${questionTypeIter == 8}">
+									<fmt:message key="label.question.type.mark.hedging" />
+								</c:when>
+							</c:choose>
+						</option>
+					</select>
+					</span>
+				</c:if>
 			</div>
 
 			<div id="grid-container" style="min-height: 300px;">
@@ -263,12 +335,8 @@
 		<div class="panel-heading">
         	<div class="pull-right">
 			    <a href="#nogo" onclick="javascript:self.parent.tb_remove();" class="btn btn-sm btn-default loffset5" style="display: inline;">
-					<fmt:message key="label.cancel" />
+					Close
 				</a>
-				<a id="import-button" class="btn btn-sm btn-default button-add-item" href="#nogo"
-					title="Import question from the question bank">
-					Import
-				</a>
 			</div>	
       	</div>
     </footer>
Index: lams_common/src/java/org/lamsfoundation/lams/qb/dao/IQbDAO.java
===================================================================
diff -u -ra109b7b66649bbed86abf584a192c6af194946ef -r72c9800d4076fa450caff0943dd4de41399c83e0
--- lams_common/src/java/org/lamsfoundation/lams/qb/dao/IQbDAO.java	(.../IQbDAO.java)	(revision a109b7b66649bbed86abf584a192c6af194946ef)
+++ lams_common/src/java/org/lamsfoundation/lams/qb/dao/IQbDAO.java	(.../IQbDAO.java)	(revision 72c9800d4076fa450caff0943dd4de41399c83e0)
@@ -13,6 +13,12 @@
      */
     QbQuestion getQbQuestionByUid(Long qbQuestionUid);
     
+    /**
+     * @param questionId
+     * @return questions sharing the same questionId
+     */
+    List<QbQuestion> getQbQuestionsByQuestionId(Integer questionId);
+    
     // finds next question ID for Question Bank question
     int getMaxQuestionId();
 
Index: lams_common/src/java/org/lamsfoundation/lams/qb/dao/hibernate/QbDAO.java
===================================================================
diff -u -r3ec7cbf6d6a62b79ba7e4334d770721f8867e999 -r72c9800d4076fa450caff0943dd4de41399c83e0
--- lams_common/src/java/org/lamsfoundation/lams/qb/dao/hibernate/QbDAO.java	(.../QbDAO.java)	(revision 3ec7cbf6d6a62b79ba7e4334d770721f8867e999)
+++ lams_common/src/java/org/lamsfoundation/lams/qb/dao/hibernate/QbDAO.java	(.../QbDAO.java)	(revision 72c9800d4076fa450caff0943dd4de41399c83e0)
@@ -19,6 +19,17 @@
     }
 
     @Override
+    public List<QbQuestion> getQbQuestionsByQuestionId(Integer questionId) {
+	final String FIND_QUESTIONS_BY_QUESTION_ID = "FROM " + QbQuestion.class.getName()
+	    + " WHERE questionId = :questionId AND local = 0 ORDER BY version ASC";
+	
+	Query<QbQuestion> q = getSession().createQuery(FIND_QUESTIONS_BY_QUESTION_ID,
+		QbQuestion.class);
+	q.setParameter("questionId", questionId);
+	return q.list();
+    }
+
+    @Override
     public int getMaxQuestionId() {
 	Object result = this.getSession().createQuery(FIND_MAX_QUESTION_ID).uniqueResult();
 	Integer max = (Integer) result;
@@ -40,14 +51,40 @@
 	//we sort of strip out HTML tags from the search by using REGEXP_REPLACE which skips all the content between < >
 	final String SELECT_QUESTIONS = "SELECT DISTINCT question.* "
 		+ " FROM lams_qb_question question  "
-		+ " LEFT OUTER JOIN lams_qb_option qboption ON qboption.qb_question_uid = question.uid "
-		+ " WHERE question.type = :questionType "
+		+ " LEFT OUTER JOIN lams_qb_option qboption "
+		+ "	ON qboption.qb_question_uid = question.uid "
+		+ " LEFT JOIN ("//help finding questions with the max available version
+		+ "	SELECT biggerQuestion.* FROM lams_qb_question biggerQuestion "  
+		+ " 		LEFT OUTER JOIN lams_qb_option qboption1 "
+		+ "		ON qboption1.qb_question_uid = biggerQuestion.uid "
+		+ "	WHERE biggerQuestion.type = :questionType "
+		+ " 	AND biggerQuestion.local = 0 "
+		+ "	AND (REGEXP_REPLACE(biggerQuestion.description, '<[^>]*>+', '') LIKE CONCAT('%', :searchString, '%')"
+		+ " 	OR biggerQuestion.name LIKE CONCAT('%', :searchString, '%') "
+		+ " 	OR REGEXP_REPLACE(qboption1.name, '<[^>]*>+', '') LIKE CONCAT('%', :searchString, '%')) "
+		+ ") AS biggerQuestion ON question.question_id = biggerQuestion.question_id AND question.version < biggerQuestion.version "
+		+ " WHERE biggerQuestion.version is NULL "
+		+ " AND question.type = :questionType "
 		+ " AND question.local = 0 "
 		+ " AND (REGEXP_REPLACE(question.description, '<[^>]*>+', '') LIKE CONCAT('%', :searchString, '%')"
 		+ " OR question.name LIKE CONCAT('%', :searchString, '%') "
 		+ " OR REGEXP_REPLACE(qboption.name, '<[^>]*>+', '') LIKE CONCAT('%', :searchString, '%')) ";
 	final String ORDER_BY_NAME = "ORDER BY question.name ";
 	final String ORDER_BY_SMTH_ELSE = "ORDER BY question.question_id ";
+	
+	//TODO check the following query with real data. and see maybe it's better than the current (it's unlikely though) [https://stackoverflow.com/a/28090544/10331386 and https://stackoverflow.com/a/612268/10331386]
+//	SELECT t1.*
+//	FROM lams_qb_question t1
+//	INNER JOIN
+//	(
+//	    SELECT `question_id`, MAX(version) AS max_version
+//	    FROM lams_qb_question as t3
+//			LEFT OUTER JOIN lams_qb_option qboption 
+//				ON qboption.qb_question_uid = t3.uid
+//		WHERE REGEXP_REPLACE(qboption.name, '<[^>]*>+', '') LIKE CONCAT('%', :searchString, '%')
+//	    GROUP BY `question_id`
+//	) t2
+//	    ON t1.`question_id` = t2.`question_id` AND t1.version = t2.max_version;
 
 	StringBuilder bldr = new StringBuilder(SELECT_QUESTIONS);
 	if ("smth_else".equalsIgnoreCase(sortBy)) {
@@ -73,9 +110,21 @@
     @Override
     public int getCountQbQuestions(Integer questionType, String searchString) {
 	final String SELECT_QUESTIONS = "SELECT COUNT(DISTINCT question.uid) "
-		+ " FROM lams_qb_question question "
-		+ " LEFT OUTER JOIN lams_qb_option qboption ON qboption.qb_question_uid = question.uid "
-		+ " WHERE question.type = :questionType "
+		+ " FROM lams_qb_question question  "
+		+ " LEFT OUTER JOIN lams_qb_option qboption "
+		+ "	ON qboption.qb_question_uid = question.uid "
+		+ " LEFT JOIN ("//help finding questions with the max available version
+		+ "	SELECT biggerQuestion.* FROM lams_qb_question biggerQuestion "  
+		+ " 		LEFT OUTER JOIN lams_qb_option qboption1 "
+		+ "		ON qboption1.qb_question_uid = biggerQuestion.uid "
+		+ "	WHERE biggerQuestion.type = :questionType "
+		+ " 	AND biggerQuestion.local = 0 "
+		+ "	AND (REGEXP_REPLACE(biggerQuestion.description, '<[^>]*>+', '') LIKE CONCAT('%', :searchString, '%')"
+		+ " 	OR biggerQuestion.name LIKE CONCAT('%', :searchString, '%') "
+		+ " 	OR REGEXP_REPLACE(qboption1.name, '<[^>]*>+', '') LIKE CONCAT('%', :searchString, '%')) "
+		+ ") AS biggerQuestion ON question.question_id = biggerQuestion.question_id AND question.version < biggerQuestion.version "
+		+ " WHERE biggerQuestion.version is NULL "
+		+ " AND question.type = :questionType "
 		+ " AND question.local = 0 "
 		+ " AND (REGEXP_REPLACE(question.description, '<[^>]*>+', '') LIKE CONCAT('%', :searchString, '%')"
 		+ " OR question.name LIKE CONCAT('%', :searchString, '%') "
Index: lams_common/src/java/org/lamsfoundation/lams/qb/model/QbQuestion.java
===================================================================
diff -u -r6de3d240b76c900f96a93ab784838f2153fbe7c5 -r72c9800d4076fa450caff0943dd4de41399c83e0
--- lams_common/src/java/org/lamsfoundation/lams/qb/model/QbQuestion.java	(.../QbQuestion.java)	(revision 6de3d240b76c900f96a93ab784838f2153fbe7c5)
+++ lams_common/src/java/org/lamsfoundation/lams/qb/model/QbQuestion.java	(.../QbQuestion.java)	(revision 72c9800d4076fa450caff0943dd4de41399c83e0)
@@ -32,6 +32,13 @@
     // questions can be of different type
     // not all tools can produce/consume all question types
     public static final int TYPE_MULTIPLE_CHOICE_SINGLE_ANSWER = 1;
+    public static final int TYPE_MATCHING_PAIRS = 2;
+    public static final int TYPE_SHORT_ANSWER = 3;
+    public static final int TYPE_NUMERICAL = 4;
+    public static final int TYPE_TRUE_FALSE = 5;
+    public static final int TYPE_ESSAY = 6;
+    public static final int TYPE_ORDERING = 7;
+    public static final int TYPE_MARK_HEDGING = 8;
 
     // primary key
     // another candidate is questionId + version, but single uid can fe searched faster
Index: lams_common/src/java/org/lamsfoundation/lams/qb/service/IQbService.java
===================================================================
diff -u -ra109b7b66649bbed86abf584a192c6af194946ef -r72c9800d4076fa450caff0943dd4de41399c83e0
--- lams_common/src/java/org/lamsfoundation/lams/qb/service/IQbService.java	(.../IQbService.java)	(revision a109b7b66649bbed86abf584a192c6af194946ef)
+++ lams_common/src/java/org/lamsfoundation/lams/qb/service/IQbService.java	(.../IQbService.java)	(revision 72c9800d4076fa450caff0943dd4de41399c83e0)
@@ -22,6 +22,12 @@
      * @return QbQuestion object with the specified uid
      */
     QbQuestion getQbQuestionByUid(Long qbQuestionUid);
+    
+    /**
+     * @param questionId
+     * @return questions sharing the same questionId
+     */
+    List<QbQuestion> getQbQuestionsByQuestionId(Integer questionId);
 
     // finds next question ID for Question Bank question
     int getMaxQuestionId();
Index: lams_common/src/java/org/lamsfoundation/lams/qb/service/QbService.java
===================================================================
diff -u -ra109b7b66649bbed86abf584a192c6af194946ef -r72c9800d4076fa450caff0943dd4de41399c83e0
--- lams_common/src/java/org/lamsfoundation/lams/qb/service/QbService.java	(.../QbService.java)	(revision a109b7b66649bbed86abf584a192c6af194946ef)
+++ lams_common/src/java/org/lamsfoundation/lams/qb/service/QbService.java	(.../QbService.java)	(revision 72c9800d4076fa450caff0943dd4de41399c83e0)
@@ -13,6 +13,11 @@
     public QbQuestion getQbQuestionByUid(Long qbQuestionUid) {
 	return qbDAO.getQbQuestionByUid(qbQuestionUid);
     }
+    
+    @Override
+    public List<QbQuestion> getQbQuestionsByQuestionId(Integer questionId) {
+	return qbDAO.getQbQuestionsByQuestionId(questionId);
+    }
 
     @Override
     public int getMaxQuestionId() {
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/AuthoringController.java
===================================================================
diff -u -r67d7232f087b9f5c72ff41f7bbebe29cff81e099 -r72c9800d4076fa450caff0943dd4de41399c83e0
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/AuthoringController.java	(.../AuthoringController.java)	(revision 67d7232f087b9f5c72ff41f7bbebe29cff81e099)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/AuthoringController.java	(.../AuthoringController.java)	(revision 72c9800d4076fa450caff0943dd4de41399c83e0)
@@ -55,6 +55,8 @@
 import org.apache.commons.lang.math.NumberUtils;
 import org.apache.log4j.Logger;
 import org.lamsfoundation.lams.learningdesign.service.ExportToolContentException;
+import org.lamsfoundation.lams.qb.model.QbQuestion;
+import org.lamsfoundation.lams.qb.service.IQbService;
 import org.lamsfoundation.lams.questions.Answer;
 import org.lamsfoundation.lams.questions.Question;
 import org.lamsfoundation.lams.questions.QuestionExporter;
@@ -85,6 +87,7 @@
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.ModelAttribute;
 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.multipart.MultipartFile;
 
@@ -105,6 +108,9 @@
     @Qualifier("laasseAssessmentService")
     private IAssessmentService service;
 
+    @Autowired
+    private IQbService qbService;
+
     /**
      * Read assessment data from database and put them into HttpSession. It will redirect to init.do directly after this
      * method run successfully.
@@ -139,7 +145,6 @@
      */
     private String readDatabaseData(AssessmentForm assessmentForm, HttpServletRequest request, ToolAccessMode mode)
 	    throws ServletException {
-	// save toolContentID into HTTPSession
 	Long contentId = WebUtil.readLongParam(request, AssessmentConstants.PARAM_TOOL_CONTENT_ID);
 
 	List<AssessmentQuestion> questions = null;
@@ -446,7 +451,63 @@
 	    return "pages/authoring/parts/questionlist";
 	}
     }
+    
+    /**
+     * QB callback handler which adds selected QbQuestion into question list.
+     */
+    @SuppressWarnings("unchecked")
+    @RequestMapping(value = "/importQbQuestion", method = RequestMethod.POST)
+    private String importQbQuestion(HttpServletRequest request) {
+	String sessionMapID = WebUtil.readStrParam(request, AssessmentConstants.ATTR_SESSION_MAP_ID);
+	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession()
+		.getAttribute(sessionMapID);
+	SortedSet<AssessmentQuestion> questionList = getQuestionList(sessionMap);
+	
+	Long qbQuestionUid = WebUtil.readLongParam(request, "qbQuestionUid");
+	QbQuestion qbQuestion = qbService.getQbQuestionByUid(qbQuestionUid);
+	
+	
+	
+//	// check whether it is "edit(old Question)" or "add(new Question)"
+//	extractFormToAssessmentQuestion(request, questionList, questionForm, isAuthoringRestricted);
+//
+//	reinitializeAvailableQuestions(sessionMap);
+//	
+//	
+//	
+//	
+//	//create new ScratchieItem and assign imported qbQuestion to it
+//	ScratchieItem item = new ScratchieItem();
+//	item.setQbQuestion(qbQuestion);
+//	int maxSeq = 1;
+//	if (itemList != null && itemList.size() > 0) {
+//	    ScratchieItem last = itemList.last();
+//	    maxSeq = last.getDisplayOrder() + 1;
+//	}
+//	item.setDisplayOrder(maxSeq);
+//	item.setQbQuestionModified(IQbService.QUESTION_MODIFIED_NONE);
+//	itemList.add(item);
+	
+	
+	
+	
+	
+	
 
+
+	// evict everything manually as we do not use DTOs, just real entities
+	// without eviction changes would be saved immediately into DB
+//	scratchieService.releaseFromCache(item);
+//	scratchieService.releaseFromCache(item);
+//	scratchieService.releaseFromCache(item.getQbQuestion());
+	
+//	request.setAttribute("qbQuestionModified", item.getQbQuestionModified());
+
+	// set session map ID so that itemlist.jsp can get sessionMAP
+	request.setAttribute(AssessmentConstants.ATTR_SESSION_MAP_ID, sessionMapID);
+	return "pages/authoring/parts/questionlist";
+    }
+
     /**
      * Parses questions extracted from IMS QTI file and adds them as new items.
      */
Index: lams_tool_assessment/web/pages/authoring/parts/questionlist.jsp
===================================================================
diff -u -r67d7232f087b9f5c72ff41f7bbebe29cff81e099 -r72c9800d4076fa450caff0943dd4de41399c83e0
--- lams_tool_assessment/web/pages/authoring/parts/questionlist.jsp	(.../questionlist.jsp)	(revision 67d7232f087b9f5c72ff41f7bbebe29cff81e099)
+++ lams_tool_assessment/web/pages/authoring/parts/questionlist.jsp	(.../questionlist.jsp)	(revision 72c9800d4076fa450caff0943dd4de41399c83e0)
@@ -118,6 +118,7 @@
 <div class="panel panel-default voffset20">
 	<div class="panel-heading panel-title">
 		<fmt:message key="label.authoring.basic.question.bank.title" />
+		
 		<div class="btn-group btn-group-xs pull-right" role="group">
 			<a href="#nogo" onClick="javascript:importQTI()" class="btn btn-default">
 				<fmt:message key="label.authoring.basic.import.qti" /> 
@@ -126,6 +127,7 @@
 				<fmt:message key="label.authoring.basic.export.qti" />
 			</a>
 		</div>
+		
 		<div class="btn-group btn-group-xs pull-right roffset5" role="group">		
 			<c:set var="importInitUrl" >
 				<c:url value='/authoring/importInit.do'/>?sessionMapID=${sessionMapID}&KeepThis=true&TB_iframe=true
@@ -137,6 +139,21 @@
 				<fmt:message key="label.authoring.basic.export.questions" />
 			</a>
 		</div>
+<!--		
+		<div class="pull-right roffset5">
+			<c:url var="tempUrl" value="">
+				<c:param name="output">
+					<c:url value='/authoring/importQbQuestion.do'/>?httpSessionID=${httpSessionID}
+				</c:param>
+			</c:url>
+			<c:set var="returnUrl" value="${fn:substringAfter(tempUrl, '=')}" />
+		
+			<a href="<lams:LAMSURL/>/searchQB/start.do?returnUrl=${returnUrl}&toolContentId=${sessionMap.assessmentForm.assessment.contentId}&KeepThis=true&TB_iframe=true&modal=true" 
+				class="btn btn-default btn-xs thickbox"> 
+				Import from question bank
+			</a>
+		</div> 
+-->
 	</div>
 
 	<table class="table table-condensed" id="questionTable">
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaAuthoringController.java
===================================================================
diff -u -r69092337b728f903f824a74377bd0ebf9391120c -r72c9800d4076fa450caff0943dd4de41399c83e0
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaAuthoringController.java	(.../QaAuthoringController.java)	(revision 69092337b728f903f824a74377bd0ebf9391120c)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaAuthoringController.java	(.../QaAuthoringController.java)	(revision 72c9800d4076fa450caff0943dd4de41399c83e0)
@@ -40,6 +40,9 @@
 
 import org.apache.log4j.Logger;
 import org.lamsfoundation.lams.learningdesign.TextSearchConditionComparator;
+import org.lamsfoundation.lams.qb.model.QbOption;
+import org.lamsfoundation.lams.qb.model.QbQuestion;
+import org.lamsfoundation.lams.qb.service.IQbService;
 import org.lamsfoundation.lams.rating.model.RatingCriteria;
 import org.lamsfoundation.lams.tool.ToolAccessMode;
 import org.lamsfoundation.lams.tool.qa.QaAppConstants;
@@ -68,6 +71,7 @@
 import org.springframework.util.MultiValueMap;
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
 
 /**
  * Q&A Tool's authoring methods. Additionally, there is one more method that initializes authoring and it's located in
@@ -84,6 +88,9 @@
     private IQaService qaService;
 
     @Autowired
+    private IQbService qbService;
+
+    @Autowired
     @Qualifier("qaMessageService")
     private MessageService messageService;
 
@@ -105,16 +112,14 @@
 
 	validateDefaultContent(request, authoringForm);
 
-	//no problems getting the default content, will render authoring screen
-	String strToolContentID = "";
-	/* the authoring url must be passed a tool content id */
-	strToolContentID = request.getParameter(AttributeNames.PARAM_TOOL_CONTENT_ID);
+	String strToolContentID = request.getParameter(AttributeNames.PARAM_TOOL_CONTENT_ID);
 	authoringForm.setToolContentID(strToolContentID);
 
 	SessionMap<String, Object> sessionMap = new SessionMap<>();
 	sessionMap.put(QaAppConstants.ACTIVITY_TITLE_KEY, "");
 	sessionMap.put(QaAppConstants.ACTIVITY_INSTRUCTIONS_KEY, "");
 	sessionMap.put(AttributeNames.PARAM_CONTENT_FOLDER_ID, contentFolderID);
+	sessionMap.put(AttributeNames.PARAM_TOOL_CONTENT_ID, strToolContentID);
 	authoringForm.setHttpSessionID(sessionMap.getSessionID());
 
 	if (strToolContentID == null || strToolContentID.equals("")) {
@@ -591,7 +596,47 @@
 
 	return qaContent;
     }
+    
+    /**
+     * Adds QbQuestion, selected in the question bank, to the current question list.
+     */
+    @SuppressWarnings("unchecked")
+    @RequestMapping(value = "/importQbQuestion", method = RequestMethod.POST)
+    private String importQbQuestion(@ModelAttribute("newQuestionForm") QaAuthoringForm authoringForm,
+	    HttpServletRequest request) {
+	String httpSessionID = WebUtil.readStrParam(request, "httpSessionID");
+	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession()
+		.getAttribute(httpSessionID);
+	
+	//get QbQuestion from DB
+	Long qbQuestionUid = WebUtil.readLongParam(request, "qbQuestionUid");
+	QbQuestion qbQuestion = qbService.getQbQuestionByUid(qbQuestionUid);
 
+	List<QaQuestionDTO> questionDTOs = (List<QaQuestionDTO>) sessionMap.get(QaAppConstants.LIST_QUESTION_DTOS);
+	boolean duplicates = AuthoringUtil.checkDuplicateQuestions(questionDTOs, qbQuestion.getName());
+	if (!duplicates) {
+	    String displayOrder = String.valueOf(questionDTOs.size() + 1);
+	    boolean requiredBoolean = false;
+	    int minWordsLimit = 0;
+	    QaQuestionDTO qaQuestionDTO = new QaQuestionDTO(qbQuestion.getName(), displayOrder, qbQuestion.getFeedback(),
+		    requiredBoolean, minWordsLimit);
+	    questionDTOs.add(qaQuestionDTO);
+	} else {
+	    //entry duplicate, not adding
+	}
+
+	request.setAttribute(QaAppConstants.LIST_QUESTION_DTOS, questionDTOs);
+	sessionMap.put(QaAppConstants.LIST_QUESTION_DTOS, questionDTOs);
+	
+	String contentFolderID = (String) sessionMap.get(AttributeNames.PARAM_CONTENT_FOLDER_ID);
+	String toolContentID = (String) sessionMap.get(AttributeNames.PARAM_TOOL_CONTENT_ID);
+	authoringForm.setContentFolderID(contentFolderID);
+	authoringForm.setHttpSessionID(httpSessionID);
+	authoringForm.setToolContentID(toolContentID);
+	request.setAttribute("authoringForm", authoringForm);
+	return "authoring/itemlist";
+    }
+
     /**
      * saveSingleQuestion
      */
Index: lams_tool_laqa/web/authoring/AuthoringTabsHolder.jsp
===================================================================
diff -u -r24ebb6c91f49a10f1e5718036b3a3c1a80c3314f -r72c9800d4076fa450caff0943dd4de41399c83e0
--- lams_tool_laqa/web/authoring/AuthoringTabsHolder.jsp	(.../AuthoringTabsHolder.jsp)	(revision 24ebb6c91f49a10f1e5718036b3a3c1a80c3314f)
+++ lams_tool_laqa/web/authoring/AuthoringTabsHolder.jsp	(.../AuthoringTabsHolder.jsp)	(revision 72c9800d4076fa450caff0943dd4de41399c83e0)
@@ -2,25 +2,23 @@
         
 <%@ include file="/common/taglibs.jsp"%>
 <%@ page import="org.lamsfoundation.lams.tool.qa.QaAppConstants"%>
-<c:set var="lams">
-	<lams:LAMSURL />
-</c:set>
-<c:set var="tool">
-	<lams:WebAppURL />
-</c:set>
+<c:set var="lams"><lams:LAMSURL /></c:set>
+<c:set var="tool"><lams:WebAppURL /></c:set>
 
 <lams:html>		
 	<lams:head>
 	<title><fmt:message key="activity.title" /></title>
+	
 	<lams:css/>
 	<link href="${lams}css/jquery-ui-bootstrap-theme.css" rel="stylesheet" type="text/css" />
-	
+	<link href="${lams}css/thickbox.css" rel="stylesheet" type="text/css" media="screen">
+
 	<script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
 	<script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
 	<script type="text/javascript" src="${lams}includes/javascript/jquery-ui.js"></script>
 	<script type="text/javascript" src="${lams}includes/javascript/bootstrap.min.js"></script>
 	<script type="text/javascript" src="${lams}includes/javascript/bootstrap.tabcontroller.js"></script>
-	
+	<script type="text/javascript" src="${lams}includes/javascript/thickbox.js"></script>
 	<script type="text/JavaScript">
 	  function submitMethod(actionMethod) {
 		   var form = document.forms.authoringForm;
@@ -39,6 +37,10 @@
 		  function doSelectTab(tabId) {
 			selectTab(tabId);
 		  }
+
+		function refreshThickbox() {
+			tb_init('a.thickbox, area.thickbox, input.thickbox');//pass where to apply thickbox
+		};
 	</script>
 </lams:head>
 
Index: lams_tool_laqa/web/authoring/BasicContent.jsp
===================================================================
diff -u -r7ea9b852e5fe8dc5688f983f162064d862f147de -r72c9800d4076fa450caff0943dd4de41399c83e0
--- lams_tool_laqa/web/authoring/BasicContent.jsp	(.../BasicContent.jsp)	(revision 7ea9b852e5fe8dc5688f983f162064d862f147de)
+++ lams_tool_laqa/web/authoring/BasicContent.jsp	(.../BasicContent.jsp)	(revision 72c9800d4076fa450caff0943dd4de41399c83e0)
@@ -38,8 +38,9 @@
            	type: $("#newQuestionForm").attr('method'),
 			url: $("#newQuestionForm").attr('action'),
 			success: function(data) {
-				$('#resourceListArea').html($(data).find('#itemList'));
+				$('#itemArea').html($(data).find('#itemList'));
 				hideMessage();
+				refreshThickbox();
 			}
 	    });
 	}
@@ -59,7 +60,7 @@
 </div>
 
 
-<div id="resourceListArea">
+<div id="itemArea">
 	<%@ include file="/authoring/itemlist.jsp"%>
 </div>
 
Index: lams_tool_laqa/web/authoring/itemlist.jsp
===================================================================
diff -u -r8be1632bead5d286d578fc73a79fcd662af012d5 -r72c9800d4076fa450caff0943dd4de41399c83e0
--- lams_tool_laqa/web/authoring/itemlist.jsp	(.../itemlist.jsp)	(revision 8be1632bead5d286d578fc73a79fcd662af012d5)
+++ lams_tool_laqa/web/authoring/itemlist.jsp	(.../itemlist.jsp)	(revision 72c9800d4076fa450caff0943dd4de41399c83e0)
@@ -1,11 +1,29 @@
 <%@ include file="/common/taglibs.jsp"%>
+<c:set var="httpSessionID" value="${authoringForm.httpSessionID}" />
+<c:set var="sessionMap" value="${sessionScope[httpSessionID]}" />
 
 <div id="itemList">
-	<table class="table table-striped table-condensed">
-		<tr>
-			<th colspan="5"><fmt:message key="label.questions"/></th>
-		</tr>
+	<div class="panel panel-default add-file">
+	
+	<div class="panel-heading panel-title">
+		<fmt:message key="label.questions" />
+		
+		<div class="pull-right">
+			<c:url var="tempUrl" value="">
+				<c:param name="output">
+					<c:url value='/authoring/importQbQuestion.do'/>?httpSessionID=${httpSessionID}
+				</c:param>
+			</c:url>
+			<c:set var="returnUrl" value="${fn:substringAfter(tempUrl, '=')}" />
+		
+			<a href="<lams:LAMSURL/>/searchQB/start.do?returnUrl=${returnUrl}&toolContentId=${sessionMap.toolContentID}&KeepThis=true&TB_iframe=true&modal=true" 
+				class="btn btn-default btn-xs thickbox"> 
+				Import from question bank
+			</a>
+		</div> 
+	</div>
 
+	<table class="table table-striped table-condensed">
 		<c:forEach items="${questionDTOs}" var="currentDTO"	varStatus="status">
 			<tr>
 				<td>
@@ -24,7 +42,7 @@
 		 			</c:if>
 				</td>
 				<td align="center" style="width:5%"><i class="fa fa-pencil"	title="<fmt:message key="label.tip.editQuestion" />"
-					onclick="javascript:showMessage('<lams:WebAppURL/>authoring/newEditableQuestionBox.do?questionIndex=${status.count}&contentFolderID=${authoringForm.contentFolderID}&httpSessionID=${authoringForm.httpSessionID}&toolContentID=${authoringForm.toolContentID}&usernameVisible=${authoringForm.usernameVisible}&lockWhenFinished=${authoringForm.lockWhenFinished}&questionsSequenced=${authoringForm.questionsSequenced}')"></i>
+					onclick="javascript:showMessage('<lams:WebAppURL/>authoring/newEditableQuestionBox.do?questionIndex=${status.count}&contentFolderID=${authoringForm.contentFolderID}&httpSessionID=${httpSessionID}&toolContentID=${authoringForm.toolContentID}')"></i>
 				</td>
 				<td  align="center" style="width:5%"><i class="fa fa-times"	title="<fmt:message key="label.tip.deleteQuestion" />"
 					onclick="removeQuestion(${status.count})"></i>
@@ -33,4 +51,5 @@
 		</c:forEach>
 
 	</table>
+	</div>
 </div>
\ No newline at end of file