Index: lams_tool_scratchie/conf/hibernate/mappings/org/lamsfoundation/lams/tool/scratchie/model/ScratchieSession.hbm.xml
===================================================================
diff -u -r65efb0abb529cafc1977e284e2c9a4ed33722334 -rbeb150b1b726c122ccc5af1ba95083105f9948b8
--- lams_tool_scratchie/conf/hibernate/mappings/org/lamsfoundation/lams/tool/scratchie/model/ScratchieSession.hbm.xml	(.../ScratchieSession.hbm.xml)	(revision 65efb0abb529cafc1977e284e2c9a4ed33722334)
+++ lams_tool_scratchie/conf/hibernate/mappings/org/lamsfoundation/lams/tool/scratchie/model/ScratchieSession.hbm.xml	(.../ScratchieSession.hbm.xml)	(revision beb150b1b726c122ccc5af1ba95083105f9948b8)
@@ -33,6 +33,14 @@
             insert="true"
             column="session_end_date"
         />
+        
+        <property
+            name="timeLimitLaunchedDate"
+            type="java.util.Date"
+            update="true"
+            insert="true"
+            column="time_limit_launched_date"
+        />
 
         <property
             name="sessionStartDate"
Index: lams_tool_scratchie/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -r29e67c838f4270bfaad652768fa4bfb580051dfa -rbeb150b1b726c122ccc5af1ba95083105f9948b8
--- lams_tool_scratchie/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 29e67c838f4270bfaad652768fa4bfb580051dfa)
+++ lams_tool_scratchie/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision beb150b1b726c122ccc5af1ba95083105f9948b8)
@@ -198,5 +198,8 @@
 label.unlike  =Unlike
 label.general.burning.question  =General burning question
 
+label.waiting.for.leader.launch.time.limit  =Leader has not started the activity. Please wait until he commences it.
+label.waiting.for.leader.finish  =Time limit set by teacher is over. Please wait until a group leader finishes the activity.
 
+
 #======= End labels: Exported 191 labels for en AU =====
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java
===================================================================
diff -u -r2f725f8ef2aa09a2663b2335bf67213074426d11 -rbeb150b1b726c122ccc5af1ba95083105f9948b8
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java	(.../ScratchieConstants.java)	(revision 2f725f8ef2aa09a2663b2335bf67213074426d11)
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java	(.../ScratchieConstants.java)	(revision beb150b1b726c122ccc5af1ba95083105f9948b8)
@@ -108,6 +108,8 @@
     public static final String ATTR_IS_SCRATCHING_FINISHED = "isScratchingFinished";
 
     public static final String ATTR_IS_WAITING_FOR_LEADER_TO_SUBMIT_NOTEBOOK = "isWaitingForLeaderToSubmitNotebook";
+    
+    public static final String ATTR_WAITING_MESSAGE_KEY = "waitingMessageKey";
 
     public static final String ATTR_LEARNERS = "learners";
 
@@ -162,6 +164,12 @@
     public static final String ATTR_GROUP_LEADER_NAME = "groupLeaderName";
 
     public static final String ATTR_IS_USER_LEADER = "isUserLeader";
+    
+    public static final String ATTR_IS_TIME_LIMIT_ENABLED = "isTimeLimitEnabled";
+    
+    public static final String ATTR_IS_TIME_LIMIT_NOT_LAUNCHED = "isTimeLimitNotLaunched";
+    
+    public static final String ATTR_SECONDS_LEFT = "secondsLeft";
 
     public static final String ATTR_SUBMISSION_DEADLINE = "submissionDeadline";
 
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20161205.sql
===================================================================
diff -u
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20161205.sql	(revision 0)
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20161205.sql	(revision beb150b1b726c122ccc5af1ba95083105f9948b8)
@@ -0,0 +1,14 @@
+-- Turn off autocommit, so nothing is committed if there is an error
+SET AUTOCOMMIT = 0;
+SET FOREIGN_KEY_CHECKS=0;
+----------------------Put all sql statements below here-------------------------
+
+--  LDEV-3801 keep the time limit start time in DB
+ALTER TABLE tl_lascrt11_session ADD COLUMN time_limit_launched_date datetime;
+
+----------------------Put all sql statements above here-------------------------
+
+-- If there were no errors, commit and restore autocommit to on
+COMMIT;
+SET AUTOCOMMIT = 1;
+SET FOREIGN_KEY_CHECKS=1;
\ No newline at end of file
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/BurningQuestionLike.java
===================================================================
diff -u -r5773f84ed608838de3521ecde87c52f3c72d478c -rbeb150b1b726c122ccc5af1ba95083105f9948b8
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/BurningQuestionLike.java	(.../BurningQuestionLike.java)	(revision 5773f84ed608838de3521ecde87c52f3c72d478c)
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/BurningQuestionLike.java	(.../BurningQuestionLike.java)	(revision beb150b1b726c122ccc5af1ba95083105f9948b8)
@@ -2,8 +2,6 @@
 
 /**
  * @author Andrey Balan
- *
- *
  */
 public class BurningQuestionLike {
 
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/ScratchieAnswer.java
===================================================================
diff -u -r2f725f8ef2aa09a2663b2335bf67213074426d11 -rbeb150b1b726c122ccc5af1ba95083105f9948b8
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/ScratchieAnswer.java	(.../ScratchieAnswer.java)	(revision 2f725f8ef2aa09a2663b2335bf67213074426d11)
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/ScratchieAnswer.java	(.../ScratchieAnswer.java)	(revision beb150b1b726c122ccc5af1ba95083105f9948b8)
@@ -29,9 +29,6 @@
  * Tool may contain several questions. Which in turn contain answers.
  *
  * @author Andrey Balan
- *
- *
- *
  */
 public class ScratchieAnswer implements Cloneable {
     private static final Logger log = Logger.getLogger(ScratchieAnswer.class);
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/ScratchieAnswerVisitLog.java
===================================================================
diff -u -r2f725f8ef2aa09a2663b2335bf67213074426d11 -rbeb150b1b726c122ccc5af1ba95083105f9948b8
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/ScratchieAnswerVisitLog.java	(.../ScratchieAnswerVisitLog.java)	(revision 2f725f8ef2aa09a2663b2335bf67213074426d11)
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/ScratchieAnswerVisitLog.java	(.../ScratchieAnswerVisitLog.java)	(revision beb150b1b726c122ccc5af1ba95083105f9948b8)
@@ -30,9 +30,6 @@
  * Scratchie
  *
  * @author Andrey Balan
- *
- *
- *
  */
 public class ScratchieAnswerVisitLog {
 
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/ScratchieBurningQuestion.java
===================================================================
diff -u -r2f725f8ef2aa09a2663b2335bf67213074426d11 -rbeb150b1b726c122ccc5af1ba95083105f9948b8
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/ScratchieBurningQuestion.java	(.../ScratchieBurningQuestion.java)	(revision 2f725f8ef2aa09a2663b2335bf67213074426d11)
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/ScratchieBurningQuestion.java	(.../ScratchieBurningQuestion.java)	(revision beb150b1b726c122ccc5af1ba95083105f9948b8)
@@ -29,9 +29,6 @@
  * ScratchieBurningQuestion
  *
  * @author Andrey Balan
- *
- *
- *
  */
 public class ScratchieBurningQuestion {
 
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/ScratchieItem.java
===================================================================
diff -u -r2f725f8ef2aa09a2663b2335bf67213074426d11 -rbeb150b1b726c122ccc5af1ba95083105f9948b8
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/ScratchieItem.java	(.../ScratchieItem.java)	(revision 2f725f8ef2aa09a2663b2335bf67213074426d11)
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/ScratchieItem.java	(.../ScratchieItem.java)	(revision beb150b1b726c122ccc5af1ba95083105f9948b8)
@@ -34,9 +34,6 @@
  * Tool may contain several questions. Which in turn contain answers.
  *
  * @author Andrey Balan
- *
- *
- *
  */
 public class ScratchieItem implements Cloneable {
     private static final Logger log = Logger.getLogger(ScratchieItem.class);
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/ScratchieSession.java
===================================================================
diff -u -r2f725f8ef2aa09a2663b2335bf67213074426d11 -rbeb150b1b726c122ccc5af1ba95083105f9948b8
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/ScratchieSession.java	(.../ScratchieSession.java)	(revision 2f725f8ef2aa09a2663b2335bf67213074426d11)
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/ScratchieSession.java	(.../ScratchieSession.java)	(revision beb150b1b726c122ccc5af1ba95083105f9948b8)
@@ -33,9 +33,6 @@
  * Scratchie
  *
  * @author Andrey Balan
- *
- *
- *
  */
 public class ScratchieSession {
 
@@ -47,6 +44,8 @@
     private Scratchie scratchie;
     private Date sessionStartDate;
     private Date sessionEndDate;
+    //date when user has started activity (pressed start button) that has time limitation
+    private Date timeLimitLaunchedDate;
     // finish or not
     private int status;
     // scratchie Items
@@ -84,7 +83,19 @@
 
     /**
      *
+     * @return
+     */
+    public Date getTimeLimitLaunchedDate() {
+	return timeLimitLaunchedDate;
+    }
+
+    public void setTimeLimitLaunchedDate(Date timeLimitLaunchedDate) {
+	this.timeLimitLaunchedDate = timeLimitLaunchedDate;
+    }
+
+    /**
      *
+     *
      * @return
      */
     public Date getSessionStartDate() {
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/ScratchieUser.java
===================================================================
diff -u -r2f725f8ef2aa09a2663b2335bf67213074426d11 -rbeb150b1b726c122ccc5af1ba95083105f9948b8
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/ScratchieUser.java	(.../ScratchieUser.java)	(revision 2f725f8ef2aa09a2663b2335bf67213074426d11)
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/ScratchieUser.java	(.../ScratchieUser.java)	(revision beb150b1b726c122ccc5af1ba95083105f9948b8)
@@ -32,9 +32,6 @@
  * Scratchie
  *
  * @author Andrey Balan
- *
- *
- *
  */
 public class ScratchieUser implements Cloneable, Comparable {
     private static final long serialVersionUID = -7043502180037866257L;
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml
===================================================================
diff -u -r5f1cadc89726925aa93eac489cd88e76439cbc4a -rbeb150b1b726c122ccc5af1ba95083105f9948b8
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml	(.../scratchieApplicationContext.xml)	(revision 5f1cadc89726925aa93eac489cd88e76439cbc4a)
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml	(.../scratchieApplicationContext.xml)	(revision beb150b1b726c122ccc5af1ba95083105f9948b8)
@@ -115,6 +115,7 @@
 			<ref bean="eventNotificationService"/>
 		</property>
 		<property name="scratchieOutputFactory"><ref bean="scratchieOutputFactory"/></property>
+		<property name="scheduler"><ref bean="scheduler"/></property>
     </bean>
 
     <bean id="scratchieService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
@@ -137,6 +138,7 @@
                 <prop key="delete*">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
                 <prop key="remove*">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
                 <prop key="save*">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
+                <prop key="launchTimeLimit">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
                 <prop key="resetDefineLater">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
                 <prop key="recordItemScratched">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
                 <prop key="changeUserMark">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java
===================================================================
diff -u -rae63df3e06f618712e1eab064a05015eb45c2f17 -rbeb150b1b726c122ccc5af1ba95083105f9948b8
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java	(.../IScratchieService.java)	(revision ae63df3e06f618712e1eab064a05015eb45c2f17)
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java	(.../IScratchieService.java)	(revision beb150b1b726c122ccc5af1ba95083105f9948b8)
@@ -43,6 +43,7 @@
 import org.lamsfoundation.lams.tool.scratchie.model.ScratchieSession;
 import org.lamsfoundation.lams.tool.scratchie.model.ScratchieUser;
 import org.lamsfoundation.lams.util.ExcelCell;
+import org.quartz.SchedulerException;
 
 /**
  * Interface that defines the contract that all ShareScratchie service provider must follow.
@@ -66,6 +67,14 @@
      * @param toolSessionId
      */
     ScratchieUser checkLeaderSelectToolForSessionLeader(ScratchieUser user, Long toolSessionId);
+    
+    /**
+     * Stores date when user has started activity with time limit.
+     * 
+     * @param sessionId
+     * @throws SchedulerException 
+     */
+    void launchTimeLimit(Long sessionId) throws SchedulerException;
 
     List<ScratchieBurningQuestion> getBurningQuestionsBySession(Long sessionId);
 
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
===================================================================
diff -u -rae63df3e06f618712e1eab064a05015eb45c2f17 -rbeb150b1b726c122ccc5af1ba95083105f9948b8
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java	(.../ScratchieServiceImpl.java)	(revision ae63df3e06f618712e1eab064a05015eb45c2f17)
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java	(.../ScratchieServiceImpl.java)	(revision beb150b1b726c122ccc5af1ba95083105f9948b8)
@@ -28,8 +28,10 @@
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Calendar;
 import java.util.Collection;
 import java.util.Date;
+import java.util.GregorianCalendar;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
@@ -39,6 +41,7 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.SortedMap;
+import java.util.TimeZone;
 import java.util.TreeSet;
 
 import org.apache.commons.lang.StringEscapeUtils;
@@ -87,6 +90,7 @@
 import org.lamsfoundation.lams.tool.scratchie.model.ScratchieItem;
 import org.lamsfoundation.lams.tool.scratchie.model.ScratchieSession;
 import org.lamsfoundation.lams.tool.scratchie.model.ScratchieUser;
+import org.lamsfoundation.lams.tool.scratchie.util.FinishScratchingJob;
 import org.lamsfoundation.lams.tool.scratchie.util.ScratchieAnswerComparator;
 import org.lamsfoundation.lams.tool.scratchie.util.ScratchieItemComparator;
 import org.lamsfoundation.lams.tool.scratchie.util.ScratchieToolContentHandler;
@@ -99,6 +103,12 @@
 import org.lamsfoundation.lams.util.JsonUtil;
 import org.lamsfoundation.lams.util.MessageService;
 import org.lamsfoundation.lams.util.audit.IAuditService;
+import org.quartz.JobBuilder;
+import org.quartz.JobDetail;
+import org.quartz.Scheduler;
+import org.quartz.SchedulerException;
+import org.quartz.Trigger;
+import org.quartz.TriggerBuilder;
 
 /**
  * @author Andrey Balan
@@ -149,6 +159,8 @@
     private IEventNotificationService eventNotificationService;
 
     private ScratchieOutputFactory scratchieOutputFactory;
+    
+    private Scheduler scheduler;
 
     // *******************************************************************************
     // Service method
@@ -256,6 +268,39 @@
 	}
 	return leader;
     }
+    
+    @Override
+    public void launchTimeLimit(Long sessionId) throws SchedulerException {
+	ScratchieSession session = getScratchieSessionBySessionId(sessionId);
+	int timeLimit = session.getScratchie().getTimeLimit();
+	if (timeLimit == 0) {
+	    return;
+	}
+	
+	//store timeLimitLaunchedDate into DB
+	Date timeLimitLaunchedDate = new Date();
+	session.setTimeLimitLaunchedDate(timeLimitLaunchedDate);
+	scratchieSessionDao.saveObject(session);
+	
+	//calculate timeLimit finish date
+	Calendar timeLimitFinishDate = new GregorianCalendar(TimeZone.getDefault());
+	timeLimitFinishDate.setTime(timeLimitLaunchedDate);
+	timeLimitFinishDate.add(Calendar.MINUTE, timeLimit);
+	//adding 5 extra seconds to let leader auto-submit results and store them in DB
+	timeLimitFinishDate.add(Calendar.SECOND, 5);
+	
+	//start quartz job to notify non-leaders time is over
+	JobDetail finishScratchingJob = JobBuilder.newJob(FinishScratchingJob.class)
+		.withIdentity("finishScratching:" + sessionId)
+		.withDescription("Group name: " + session.getSessionName())
+		.usingJobData("toolSessionId", sessionId).build();
+	
+	Trigger fnishScratchingTrigger = TriggerBuilder.newTrigger()
+		.withIdentity("fnishScratchingTrigger:" + sessionId)
+		.startAt(timeLimitFinishDate.getTime()).build();
+	
+	scheduler.scheduleJob(finishScratchingJob, fnishScratchingTrigger);
+    }
 
     @Override
     public void changeUserMark(Long userId, Long sessionId, Integer newMark) {
@@ -2044,6 +2089,14 @@
     public void setScratchieOutputFactory(ScratchieOutputFactory scratchieOutputFactory) {
 	this.scratchieOutputFactory = scratchieOutputFactory;
     }
+    
+    /**
+     * @param scheduler
+     *            The scheduler to set.
+     */
+    public void setScheduler(Scheduler scheduler) {
+	this.scheduler = scheduler;
+    }
 
     // ****************** REST methods *************************
 
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/util/FinishScratchingJob.java
===================================================================
diff -u
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/util/FinishScratchingJob.java	(revision 0)
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/util/FinishScratchingJob.java	(revision beb150b1b726c122ccc5af1ba95083105f9948b8)
@@ -0,0 +1,60 @@
+package org.lamsfoundation.lams.tool.scratchie.util;
+
+import java.io.IOException;
+import java.util.Map;
+
+import org.apache.log4j.Logger;
+import org.apache.tomcat.util.json.JSONException;
+import org.lamsfoundation.lams.tool.scratchie.model.ScratchieSession;
+import org.lamsfoundation.lams.tool.scratchie.service.IScratchieService;
+import org.lamsfoundation.lams.tool.scratchie.web.action.LearningWebsocketServer;
+import org.quartz.JobExecutionContext;
+import org.quartz.JobExecutionException;
+import org.quartz.SchedulerContext;
+import org.quartz.SchedulerException;
+import org.springframework.context.ApplicationContext;
+import org.springframework.scheduling.quartz.QuartzJobBean;
+
+/**
+ * The Quartz sheduling job that finishes scratching for the given ToolSession (which will automatically lead to showing
+ * Finish button all non-leaders and thus let then finish the activity).
+ *
+ * @author Andrey Balan
+ */
+public class FinishScratchingJob extends QuartzJobBean {
+    
+    private static Logger log = Logger.getLogger(FinishScratchingJob.class);
+
+    @Override
+    protected void executeInternal(JobExecutionContext context) throws JobExecutionException {
+	IScratchieService scratchieService = getScratchieService(context);
+
+	//getting toolSessionId set from scheduler
+	Map properties = context.getJobDetail().getJobDataMap();
+	Long toolSessionId = (Long) properties.get("toolSessionId");
+	ScratchieSession toolSession = scratchieService.getScratchieSessionBySessionId(toolSessionId);
+	
+	// if leader hasn't finished scratching yet - let all non-leaders see Next Activity button
+	if (!toolSession.isScratchingFinished()) {
+	    try {
+		scratchieService.setScratchingFinished(toolSessionId);
+	    } catch (JSONException | IOException e) {
+		throw new RuntimeException(e);
+	    }
+	}
+
+	if (log.isDebugEnabled()) {
+	    log.debug("Scratching is finished for toolSessionId: " + toolSessionId.longValue());
+	}
+    }
+    
+    protected IScratchieService getScratchieService(JobExecutionContext context) throws JobExecutionException {
+	try {
+	    SchedulerContext sc = context.getScheduler().getContext();
+	    ApplicationContext cxt = (ApplicationContext) sc.get("context.central");
+	    return (IScratchieService) cxt.getBean("scratchieService");
+	} catch (SchedulerException e) {
+	    throw new JobExecutionException("Failed look up the scratchieService" + e.toString());
+	}
+    }
+}
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java
===================================================================
diff -u -rae63df3e06f618712e1eab064a05015eb45c2f17 -rbeb150b1b726c122ccc5af1ba95083105f9948b8
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java	(.../LearningAction.java)	(revision ae63df3e06f618712e1eab064a05015eb45c2f17)
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java	(.../LearningAction.java)	(revision beb150b1b726c122ccc5af1ba95083105f9948b8)
@@ -72,6 +72,7 @@
 import org.lamsfoundation.lams.web.session.SessionManager;
 import org.lamsfoundation.lams.web.util.AttributeNames;
 import org.lamsfoundation.lams.web.util.SessionMap;
+import org.quartz.SchedulerException;
 import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.context.support.WebApplicationContextUtils;
 
@@ -87,7 +88,7 @@
     @Override
     public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 	    HttpServletResponse response)
-	    throws IOException, ServletException, JSONException, ScratchieApplicationException {
+	    throws IOException, ServletException, JSONException, ScratchieApplicationException, SchedulerException {
 
 	String param = mapping.getParameter();
 	// -----------------------Scratchie Learner function ---------------------------
@@ -97,6 +98,9 @@
 	if (param.equals("recordItemScratched")) {
 	    return recordItemScratched(mapping, form, request, response);
 	}
+	if (param.equals("launchTimeLimit")) {
+	    return launchTimeLimit(mapping, form, request, response);
+	}
 	if (param.equals("finish")) {
 	    return finish(mapping, form, request, response);
 	}
@@ -176,6 +180,30 @@
 	    return mapping.findForward("waitforleader");
 	}
 
+	// forwards to the waitForLeader time limit pages
+	if (!mode.isTeacher()) {
+	    boolean isNonLeader = !user.getUserId().equals(groupLeader.getUserId());
+	    if (isNonLeader && scratchie.getTimeLimit() != 0 && !user.isSessionFinished()) {
+
+		//show waitForLeaderLaunchTimeLimit page if the leader hasn't started activity or hasn't pressed OK button to launch time limit
+		if (toolSession.getTimeLimitLaunchedDate() == null) {
+		    request.setAttribute(ScratchieConstants.ATTR_WAITING_MESSAGE_KEY, "label.waiting.for.leader.launch.time.limit");
+		    return mapping.findForward("waitForLeaderTimeLimit");
+		}
+		
+		// check if the time limit is exceeded
+		boolean isTimeLimitExceeded = toolSession.getTimeLimitLaunchedDate().getTime()
+			+ scratchie.getTimeLimit() * 60000 < System.currentTimeMillis();
+		
+		// if the time is up and leader hasn't submitted response (as there will be a little delay between time
+		// is up and scratching is finished) - show waitForLeaderFinish page
+		if (isTimeLimitExceeded && !toolSession.isScratchingFinished()) {
+		    request.setAttribute(ScratchieConstants.ATTR_WAITING_MESSAGE_KEY, "label.waiting.for.leader.finish");
+		    return mapping.findForward("waitForLeaderTimeLimit");
+		}
+	    }
+	}
+
 	// initial Session Map
 	SessionMap<String, Object> sessionMap = new SessionMap<String, Object>();
 	request.getSession().setAttribute(sessionMap.getSessionID(), sessionMap);
@@ -306,24 +334,40 @@
 	    redirect.addParameter(ScratchieConstants.ATTR_SESSION_MAP_ID, sessionMap.getSessionID());
 	    return redirect;
 
-	    // show leader notebook page
+	// show leader notebook page
 	} else if (isUserLeader && isScratchingFinished && isWaitingForLeaderToSubmitNotebook) {
 	    ActionRedirect redirect = new ActionRedirect(mapping.findForwardConfig("newReflection"));
 	    redirect.addParameter(ScratchieConstants.ATTR_SESSION_MAP_ID, sessionMap.getSessionID());
 	    redirect.addParameter(AttributeNames.ATTR_MODE, mode);
 	    return redirect;
 
-	    // show results page
+	// show results page
 	} else if (isShowResults) {
 
 	    ActionRedirect redirect = new ActionRedirect(mapping.findForwardConfig("showResults"));
 	    redirect.addParameter(ScratchieConstants.ATTR_SESSION_MAP_ID, sessionMap.getSessionID());
 	    redirect.addParameter(AttributeNames.ATTR_MODE, mode);
 	    return redirect;
 
-	    // show learning.jsp page
+	// show learning.jsp page
 	} else {
 
+	    // time limit feature
+	    boolean isTimeLimitEnabled = isUserLeader && !isScratchingFinished && scratchie.getTimeLimit() != 0;
+	    boolean isTimeLimitNotLaunched = toolSession.getTimeLimitLaunchedDate() == null;
+	    long secondsLeft = 1;
+	    if (isTimeLimitEnabled) {
+		// if user has pressed OK button already - calculate remaining time, and full time otherwise
+		secondsLeft = isTimeLimitNotLaunched ? scratchie.getTimeLimit() * 60
+			: scratchie.getTimeLimit() * 60
+				- (System.currentTimeMillis() - toolSession.getTimeLimitLaunchedDate().getTime()) / 1000;
+		// change negative number or zero to 1 so it can autosubmit results
+		secondsLeft = Math.max(1, secondsLeft);
+	    }
+	    request.setAttribute(ScratchieConstants.ATTR_IS_TIME_LIMIT_ENABLED, isTimeLimitEnabled);
+	    request.setAttribute(ScratchieConstants.ATTR_IS_TIME_LIMIT_NOT_LAUNCHED, isTimeLimitNotLaunched);
+	    request.setAttribute(ScratchieConstants.ATTR_SECONDS_LEFT, secondsLeft);
+
 	    // make non leaders also wait for burning questions submit
 	    isWaitingForLeaderToSubmitNotebook |= isWaitingForLeaderToSubmitBurningQuestions;
 
@@ -351,7 +395,7 @@
 
 	ScratchieSession toolSession = service.getScratchieSessionBySessionId(toolSessionId);
 
-	ScratchieUser leader = this.getCurrentUser(toolSessionId);
+	ScratchieUser leader = getCurrentUser(toolSessionId);
 	// only leader is allowed to scratch answers
 	if (!toolSession.isUserGroupLeader(leader.getUid())) {
 	    return null;
@@ -386,7 +430,32 @@
 
 	return null;
     }
+    
+    /**
+     * Stores date when user has started activity with time limit
+     * @throws ScratchieApplicationException 
+     * @throws SchedulerException 
+     */
+    private ActionForward launchTimeLimit(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) throws ScratchieApplicationException, SchedulerException {
+	initializeScratchieService();
+	String sessionMapID = WebUtil.readStrParam(request, ScratchieConstants.ATTR_SESSION_MAP_ID);
+	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession()
+		.getAttribute(sessionMapID);
+	final Long toolSessionId = (Long) sessionMap.get(AttributeNames.PARAM_TOOL_SESSION_ID);
+	ScratchieSession toolSession = service.getScratchieSessionBySessionId(toolSessionId);
+	
+	ScratchieUser leader = getCurrentUser(toolSessionId);
+	// only leader is allowed to launch time limit
+	if (!toolSession.isUserGroupLeader(leader.getUid())) {
+	    return null;
+	}
+	
+	service.launchTimeLimit(toolSessionId);
 
+	return null;
+    }
+
     /**
      * Displays results page. When leader gets to this page, scratchingFinished column is set to true for all users.
      *
Index: lams_tool_scratchie/web/WEB-INF/struts-config.xml
===================================================================
diff -u -r480406c3b8253f063ad53045227a09a79e98f1d5 -rbeb150b1b726c122ccc5af1ba95083105f9948b8
--- lams_tool_scratchie/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision 480406c3b8253f063ad53045227a09a79e98f1d5)
+++ lams_tool_scratchie/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision beb150b1b726c122ccc5af1ba95083105f9948b8)
@@ -205,6 +205,7 @@
 			parameter="start" >
 			<forward name="success" path="/pages/learning/learning.jsp" />
 			<forward name="waitforleader" path="/pages/learning/waitforleader.jsp" />
+			<forward name="waitForLeaderTimeLimit" path="/pages/learning/waitForLeaderTimeLimit.jsp" />
 			<forward name="newReflection" path="/learning/newReflection.do" />
 			<forward name="showBurningQuestions" path="/learning/showBurningQuestions.do" />
 			<forward name="showResults" path="/learning/showResults.do" />
@@ -215,6 +216,10 @@
 			type="org.lamsfoundation.lams.tool.scratchie.web.action.LearningAction"
 			parameter="recordItemScratched" >
 		</action>
+		<action path="/learning/launchTimeLimit"
+			type="org.lamsfoundation.lams.tool.scratchie.web.action.LearningAction"
+			parameter="launchTimeLimit" >
+		</action>
 		<action path="/learning/showResults"
 			type="org.lamsfoundation.lams.tool.scratchie.web.action.LearningAction"
 			parameter="showResults" >
Index: lams_tool_scratchie/web/pages/learning/learning.jsp
===================================================================
diff -u -r5f05f0ea0765aae9eaec741f5419fa9f7762f150 -rbeb150b1b726c122ccc5af1ba95083105f9948b8
--- lams_tool_scratchie/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 5f05f0ea0765aae9eaec741f5419fa9f7762f150)
+++ lams_tool_scratchie/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision beb150b1b726c122ccc5af1ba95083105f9948b8)
@@ -69,20 +69,38 @@
 		}
 
 		//time limit feature
-		<c:if test="${not sessionMap.userFinished && scratchie.timeLimit > 0 && (mode != 'teacher')}">
+		<c:if test="${isTimeLimitEnabled}">
 			$(document).ready(function(){
-				//show confirmation dialog
-				$.blockUI({ 
-					message: $('#timelimit-start-dialog'), 
-					css: { width: '325px', height: '120px'}, 
-					overlayCSS: { opacity: '.98'} 
-				});
+				
+				//show timelimit-start-dialog in order to start countdown
+				if (${isTimeLimitNotLaunched}) {
 					
-				//once OK button pressed start countdown
-			    $('#timelimit-start-ok').click(function() {
-			       	$.unblockUI();
-			       	displayCountdown();
-			    });
+					//show confirmation dialog
+					$.blockUI({ 
+						message: $('#timelimit-start-dialog'), 
+						css: { width: '325px', height: '120px'}, 
+						overlayCSS: { opacity: '.98'} 
+					});
+						
+					//once OK button pressed start countdown
+				    $('#timelimit-start-ok').click(function() {
+				    	
+			        	//store date when user has started activity with time limit
+				        $.ajax({
+				        	async: true,
+				            url: '<c:url value="/learning/launchTimeLimit.do"/>',
+				            data: 'sessionMapID=${sessionMapID}',
+				            type: 'post'
+				       	});
+			        	
+				       	$.unblockUI();
+				       	displayCountdown();
+				    });
+					
+				} else {
+					displayCountdown();
+				}
+
 			});
 			
 			function displayCountdown(){
@@ -103,14 +121,14 @@
 				});
 				
 				$('#countdown').countdown({
-					until: '+${scratchie.timeLimit * 60}S',  
+					until: '+${secondsLeft}S',  
 					format: 'hMS',
 					compact: true,
 					onTick: function(periods) {
 						//check for 30 seconds
 						if ((periods[4] == 0) && (periods[5] == 0) && (periods[6] <= 30)) {
 							$('#countdown').css('color', '#FF3333');
-						}					
+						}		
 					},
 					onExpiry: function(periods) {
 				        $.blockUI({ message: '<h1 id="timelimit-expired"><i class="fa fa-refresh fa-spin fa-fw"></i> <fmt:message key="label.time.is.over" /></h1>' }); 
Index: lams_tool_scratchie/web/pages/learning/waitForLeaderTimeLimit.jsp
===================================================================
diff -u
--- lams_tool_scratchie/web/pages/learning/waitForLeaderTimeLimit.jsp	(revision 0)
+++ lams_tool_scratchie/web/pages/learning/waitForLeaderTimeLimit.jsp	(revision beb150b1b726c122ccc5af1ba95083105f9948b8)
@@ -0,0 +1,38 @@
+<!DOCTYPE html>
+
+<%@ include file="/common/taglibs.jsp"%>
+
+<lams:html>
+<lams:head>
+	<title><fmt:message key="label.learning.title" /></title>
+	<%@ include file="/common/header.jsp"%>
+
+	<script type="text/javascript">
+		function refresh() {
+			location.reload();
+		}
+
+		//refresh page every 30 sec
+		setTimeout("refresh();", 30000);
+	</script>
+</lams:head>
+<body class="stripes">
+
+	<lams:Page type="learner" title="${scratchie.title}">
+
+		<lams:Alert id="waitingForLeader" type="info" close="false">
+			<fmt:message key="${waitingMessageKey}" />
+		</lams:Alert>
+
+		<div class="voffset10">
+			<html:button property="refreshButton" onclick="refresh();" styleClass="btn btn-sm btn-default pull-right">
+				<fmt:message key="label.refresh" />
+			</html:button>
+		</div>
+
+
+		<div id="footer"></div>
+	</lams:Page>
+</body>
+</lams:html>
+