Index: lams_central/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r7ba9ed71bbc4ef9c86c6204497a65e96bed88a04 -rf6f3e50bca627b971bbd84d4aa341d3ea37890e2
--- lams_central/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 7ba9ed71bbc4ef9c86c6204497a65e96bed88a04)
+++ lams_central/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision f6f3e50bca627b971bbd84d4aa341d3ea37890e2)
@@ -858,6 +858,7 @@
 authoring.section.introduction  =Introduction
 authoring.create.question  =Add Question
 authoring.create.question.qb = From question bank...
+label.question.bank = Question Bank
 authoring.create.essay.question  =Add Essay Question
 authoring.create.mc.question  =Add Multiple Choice Question
 authoring.label.application.exercise.num  =Application Exercise {0}
Index: lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateController.java
===================================================================
diff -u -rc0f4a7e33200e148a97d30cb2091ecea22c3cfc7 -rf6f3e50bca627b971bbd84d4aa341d3ea37890e2
--- lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateController.java	(.../LdTemplateController.java)	(revision c0f4a7e33200e148a97d30cb2091ecea22c3cfc7)
+++ lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateController.java	(.../LdTemplateController.java)	(revision f6f3e50bca627b971bbd84d4aa341d3ea37890e2)
@@ -51,6 +51,9 @@
 import org.lamsfoundation.lams.learningdesign.Grouping;
 import org.lamsfoundation.lams.learningdesign.LearningDesign;
 import org.lamsfoundation.lams.learningdesign.exception.LearningDesignException;
+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.QuestionParser;
@@ -65,10 +68,13 @@
 import org.lamsfoundation.lams.util.FileUtil;
 import org.lamsfoundation.lams.util.JsonUtil;
 import org.lamsfoundation.lams.util.WebUtil;
+import org.lamsfoundation.lams.web.util.AttributeNames;
 import org.lamsfoundation.lams.workspace.service.IWorkspaceManagementService;
 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.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.context.WebApplicationContext;
 
@@ -116,6 +122,8 @@
     @Autowired
     protected IAuthoringFullService authoringService;
     @Autowired
+    protected IQbService qbService;
+    @Autowired
     protected IToolDAO toolDAO;
 
     protected static final String CONTENT_TYPE_JSON = "application/json;charset=utf-8";
@@ -1388,6 +1396,33 @@
 	return "/authoring/template/tool/" + templatePage;
     }
 
+    /**
+     * Gets a QB question based on its UID and creates a structure for template wizard JSP.
+     */
+    @RequestMapping("/importQb")
+    private String importQuestionFromQb(@RequestParam long qbQuestionUid, @RequestParam int questionNumber, Model model)
+	    throws UnsupportedEncodingException {
+	QbQuestion qbQuestion = qbService.getQuestionByUid(qbQuestionUid);
+
+	Assessment question = new Assessment();
+	question.setType(Assessment.ASSESSMENT_QUESTION_TYPE_MULTIPLE_CHOICE);
+	question.setTitle(qbQuestion.getName());
+	question.setText(qbQuestion.getDescription());
+	question.setUuid(qbQuestion.getUuid().toString());
+
+	List<AssessMCAnswer> answers = question.getAnswers();
+	for (QbOption qbOption : qbQuestion.getQbOptions()) {
+	    AssessMCAnswer answer = new AssessMCAnswer(qbOption.getDisplayOrder(), qbOption.getName(),
+		    qbOption.getMaxMark());
+	    answers.add(answer);
+	}
+
+	model.addAttribute(AttributeNames.PARAM_CONTENT_FOLDER_ID, qbQuestion.getContentFolderId());
+	model.addAttribute("question", question);
+	model.addAttribute("questionNumber", questionNumber);
+	return "/authoring/template/tool/mcquestion";
+    }
+
     private List<Assessment> preprocessQuestions(Question[] questions, String contentFolderID) {
 
 	List<Assessment> assessments = new ArrayList<>(questions.length);
@@ -1531,6 +1566,10 @@
 		case ("peerreviewstar"):
 		    path = "authoring/template/tool/peerreviewstar";
 		    break;
+		case ("importQb"):
+		    // further processing in another action method
+		    path = "forward:importQb.do";
+		    break;
 		default:
 		    path = null;
 		    break;
Index: lams_central/web/authoring/template/tbl/tbl.jsp
===================================================================
diff -u -r7ba9ed71bbc4ef9c86c6204497a65e96bed88a04 -rf6f3e50bca627b971bbd84d4aa341d3ea37890e2
--- lams_central/web/authoring/template/tbl/tbl.jsp	(.../tbl.jsp)	(revision 7ba9ed71bbc4ef9c86c6204497a65e96bed88a04)
+++ lams_central/web/authoring/template/tbl/tbl.jsp	(.../tbl.jsp)	(revision f6f3e50bca627b971bbd84d4aa341d3ea37890e2)
@@ -13,10 +13,21 @@
  	<%@ include file="../header.jsp" %>
  	<link rel="stylesheet" href="<lams:LAMSURL/>css/x-editable.css"> 
 	<link rel="stylesheet" href="<lams:LAMSURL/>css/x-editable-lams.css"> 
- 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/x-editable.js"></script>
- 
- 	<title><fmt:message key="authoring.tbl.template.title"/></title>
+	<style>
+		/* Hide it initially */
+		#question-bank-div {
+			display: none;
+			margin-top: 20px;
+		}
+		
+		#itemArea {
+			display: none;
+		}
+	</style>
 	
+	<title><fmt:message key="authoring.tbl.template.title"/></title>
+	
+	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/x-editable.js"></script>
 	<script type="text/javascript">
 
 		<%@ include file="../comms.jsp" %>
@@ -127,6 +138,31 @@
 				});
 	    	}
 	    }
+	    
+	    function openQuestionBank(){
+	    	// show panel
+	    	$('#question-bank-div').slideDown(function(){
+	    		// load question bank content
+				$('#question-bank-collapse').load(
+					"<lams:LAMSURL/>searchQB/start.do",
+					{
+						// this action returns ID of the created QB question
+						// which is put into itemArea div
+						returnUrl: "<lams:LAMSURL/>qb/edit/returnQuestionUid.do",
+						// limit question to multiple choice
+						toolSignature: "lamc11"
+					}
+				);
+		    });
+	    }
+	    
+	    // this method is run when imported QB question ID is put into itemArea div
+		function refreshThickbox(){
+			// extract the ID
+			var qbQuestionUid = +$("#itemArea").text();
+			// fetch HTML with filled data from QB question
+			createQuestion('numQuestions', 'divq', 'divquestions', 'importQb', '&qbQuestionUid=' + qbQuestionUid);
+		};
 
         $(document).ready(function(){
         	$('[data-toggle="tooltip"]').tooltip();
@@ -223,6 +259,25 @@
 				<a href="#" onClick="javascript:importQTI('mcq', 'mc')" class="btn btn-default pull-right">	<i class="fa fa-upload"></i> <fmt:message key="authoring.template.basic.import.qti" /></a>
 			</span>
 			
+			<!-- Question Bank -->
+			<div class="panel-group" id="question-bank-div" role="tablist" aria-multiselectable="true"> 
+			    <div class="panel panel-default">
+			        <div class="panel-heading collapsable-icon-left" id="question-bank-heading">
+			        	<span class="panel-title">
+					    	<a role="button" data-toggle="collapse" href="#question-bank-collapse" aria-expanded="true" aria-controls="question-bank-collapse" >
+				          		<fmt:message key="label.question.bank" />
+				        	</a>
+			      		</span>
+			        </div>
+			
+					<div id="question-bank-collapse" class="panel-body panel-collapse collapse in" role="tabpanel" aria-labelledby="question-bank-heading">
+						<i class="fa fa-refresh fa-spin fa-2x fa-fw" style="margin: auto; display: block"></i>			
+					</div>
+				</div>
+			</div>
+			<!-- Hidden div just for storing ID of the imported QB question -->
+			<div id="itemArea"></div>
+			
 	    </div>
 		<div class="tab-pane" id="tab4">
             <span class="field-name"><p><fmt:message key="authoring.tbl.desc.ae" /></p></span>