Index: lams_central/web/authoring/authoring.jsp
===================================================================
diff -u -rbd4fa408454e7389b4e60bc68f2488de88eff663 -rd7807c73d8a9c76c44ea1a2a296d5f775afe2ac9
--- lams_central/web/authoring/authoring.jsp	(.../authoring.jsp)	(revision bd4fa408454e7389b4e60bc68f2488de88eff663)
+++ lams_central/web/authoring/authoring.jsp	(.../authoring.jsp)	(revision d7807c73d8a9c76c44ea1a2a296d5f775afe2ac9)
@@ -737,7 +737,7 @@
 				<td>
 					 <input class="propertiesContentFieldGroupCountEnable" type="radio"
 					 		name="propertiesContentFieldGroupDivide">
-					 <input class="propertiesContentFieldGroupCount spinner" type="text">
+					 <input class="propertiesContentFieldGroupCount spinner" type="number">
 				</td>
 			</tr>
 			<tr>
@@ -747,7 +747,7 @@
 				<td>
 					<input class="propertiesContentFieldLearnerCountEnable" type="radio"
 					 		name="propertiesContentFieldGroupDivide">
-					 <input class="propertiesContentFieldLearnerCount spinner" type="text">
+					 <input class="propertiesContentFieldLearnerCount spinner" type="number">
 				</td>
 			</tr>
 			<tr>
@@ -819,15 +819,15 @@
 					<fmt:message key="authoring.fla.page.prop.gate.delay" />
 				</td>
 				<td>
-					<input class="propertiesContentFieldOffsetDay spinner" type="text"> 
+					<input class="propertiesContentFieldOffsetDay spinner" type="number"> 
 					<fmt:message key="authoring.fla.page.prop.days" />
 				</td>
 				<td>
-					<input class="propertiesContentFieldOffsetHour spinner" type="text"> 
+					<input class="propertiesContentFieldOffsetHour spinner" type="number"> 
 					<fmt:message key="authoring.fla.page.prop.hours" />
 				</td>
 				<td>
-					<input class="propertiesContentFieldOffsetMinute spinner" type="text"> 
+					<input class="propertiesContentFieldOffsetMinute spinner" type="number"> 
 					<fmt:message key="authoring.fla.page.prop.minutes" />
 				</td>
 			</tr>
@@ -912,15 +912,15 @@
 					<fmt:message key="authoring.fla.page.prop.branching.sequences.min" />
 				</td>
 				<td>
-					<input class="propertiesContentFieldOptionalSequenceMin spinner" type="text">
+					<input class="propertiesContentFieldOptionalSequenceMin spinner" type="number">
 				</td>
 			</tr>
 			<tr>
 				<td>
 					<fmt:message key="authoring.fla.page.prop.branching.sequences.max" />
 				</td>
 				<td>
-					<input class="propertiesContentFieldOptionalSequenceMax spinner" type="text">
+					<input class="propertiesContentFieldOptionalSequenceMax spinner" type="number">
 				</td>
 			</tr>
 		</table>
@@ -964,15 +964,15 @@
 					<fmt:message key="authoring.fla.page.prop.optional.activities.min" />
 				</td>
 				<td>
-					<input class="propertiesContentFieldOptionalActivityMin spinner" type="text">
+					<input class="propertiesContentFieldOptionalActivityMin spinner" type="number">
 				</td>
 			</tr>
 			<tr>
 				<td>
 					<fmt:message key="authoring.fla.page.prop.optional.activities.max" />
 				</td>
 				<td>
-					<input class="propertiesContentFieldOptionalActivityMax spinner" type="text">
+					<input class="propertiesContentFieldOptionalActivityMax spinner" type="number">
 				</td>
 			</tr>
 		</table>
@@ -1061,10 +1061,10 @@
 		 	<option value="range"><fmt:message key="authoring.fla.page.dialog.cond.range" /></option>
 		 </select>
 		 <div id="rangeAddDiv" class="outputSelectDependent">
-			 <input id="singleRangeSpinner" class="outputSelectDependent spinner"/>
+			 <input id="singleRangeSpinner" class="outputSelectDependent spinner" type="number" />
 			 <div id="multiRangeDiv" class="outputSelectDependent">
-			 	<fmt:message key="authoring.fla.page.dialog.cond.range.from" /> <input id="multiRangeFromSpinner" class="spinner" />
-			 	<fmt:message key="authoring.fla.page.dialog.cond.range.to" /> <input id="multiRangeToSpinner" class="spinner" />
+			 	<fmt:message key="authoring.fla.page.dialog.cond.range.from" /> <input id="multiRangeFromSpinner" class="spinner" type="number" />
+			 	<fmt:message key="authoring.fla.page.dialog.cond.range.to" /> <input id="multiRangeToSpinner" class="spinner" type="number" />
 			 </div>
 			 <button id="rangeAddButton" class="btn btn-default">
 			 	<i class="fa fa-plus"></i>
Index: lams_central/web/includes/javascript/authoring/authoringProperty.js
===================================================================
diff -u -rcb4141b54c7cfe2b3acbde3d0de3c15da1c5b351 -rd7807c73d8a9c76c44ea1a2a296d5f775afe2ac9
--- lams_central/web/includes/javascript/authoring/authoringProperty.js	(.../authoringProperty.js)	(revision cb4141b54c7cfe2b3acbde3d0de3c15da1c5b351)
+++ lams_central/web/includes/javascript/authoring/authoringProperty.js	(.../authoringProperty.js)	(revision d7807c73d8a9c76c44ea1a2a296d5f775afe2ac9)
@@ -21,13 +21,13 @@
 				PropertyLib.fillGroupingDropdown(activity, activity.branchingActivity.grouping);
 				PropertyLib.fillToolInputDropdown(activity, activity.branchingActivity.input);
 				
-				$('.propertiesContentFieldOptionalSequenceMin', content).spinner('value',
+				$('.propertiesContentFieldOptionalSequenceMin', content).attr('value',
 																				 activity.branchingActivity.minOptions)
-																		.spinner('option', 'max',
+																		.attr('max',
 																				 activity.branchingActivity.branches.length);
-				$('.propertiesContentFieldOptionalSequenceMax', content).spinner('value',
+				$('.propertiesContentFieldOptionalSequenceMax', content).attr('value',
 																				 activity.branchingActivity.maxOptions)
-																		.spinner('option', {
+																		.attr({
 																			'min' : activity.branchingActivity.minOptions,
 																			'max' : activity.branchingActivity.branches.length
 																		});
@@ -37,7 +37,7 @@
 						.add($('.propertiesContentFieldMatchGroups', content).closest('tr'))
 						.hide();
 				}
-			}
+			};
 		
 		if (!content) {
 			// first run, create the content
@@ -128,26 +128,26 @@
 			}
 			
 			// min can not be higher than max; neither of them can be higher than number of branches
-			$('.propertiesContentFieldOptionalSequenceMin', content).spinner({'min' : 0})
-			  .on('spinchange', function(){
+			$('.propertiesContentFieldOptionalSequenceMin', content).attr('min', 0)
+			  .on('input', function(){
 				  var value = +$(this).val();
 				  activity.branchingActivity.minOptions = Math.min(value, activity.branchingActivity.branches.length);
 				  if (value != activity.branchingActivity.minOptions) {
-					  $(this, content).spinner('value', activity.branchingActivity.minOptions);
+					  $(this, content).attr('value', activity.branchingActivity.minOptions);
 				  }
 				  if (activity.branchingActivity.minOptions > activity.branchingActivity.maxOptions) {
-					  $('.propertiesContentFieldOptionalSequenceMax', content).spinner('value', value);
+					  $('.propertiesContentFieldOptionalSequenceMax', content).attr('value', value);
 				  }
-				  $('.propertiesContentFieldOptionalSequenceMax', content).spinner('option', 'min', value);
+				  $('.propertiesContentFieldOptionalSequenceMax', content).attr('min', value);
 			  });
 			
 			
-			$('.propertiesContentFieldOptionalSequenceMax', content).spinner({'min' : 0})
-			  .on('spinchange', function(){
+			$('.propertiesContentFieldOptionalSequenceMax', content).attr('min', 0)
+			  .on('input', function(){
 				  var value = +$(this).val();
 				  activity.branchingActivity.maxOptions = Math.min(value, activity.branchingActivity.branches.length);
 				  if (value != activity.branchingActivity.maxOptions) {
-					  $(this, content).spinner('value', activity.branchingActivity.maxOptions);
+					  $(this, content).attr('value', activity.branchingActivity.maxOptions);
 				  }
 			  });
 			
@@ -250,23 +250,23 @@
 			};
 			
 			// create groups/learners spinners
-			$('.propertiesContentFieldOffsetDay', content).spinner({
+			$('.propertiesContentFieldOffsetDay', content).attr({
 				'min' : 0,
 				'max' : 364
-			}).spinner('value', activity.offsetDay || 0)
-			  .on('spinchange', changeFunction);
+			}).attr('value', activity.offsetDay || 0)
+			  .on('input', changeFunction);
 			
-			$('.propertiesContentFieldOffsetHour', content).spinner({
+			$('.propertiesContentFieldOffsetHour', content).attr({
 				'min' : 0,
 				'max' : 23
-			}).spinner('value', activity.offsetHour || 0)
-			  .on('spinchange', changeFunction);
+			}).attr('value', activity.offsetHour || 0)
+			  .on('input', changeFunction);
 			
-			$('.propertiesContentFieldOffsetMinute', content).spinner({
+			$('.propertiesContentFieldOffsetMinute', content).attr({
 				'min' : 0,
 				'max' : 59
-			}).spinner('value', activity.offsetMinute || 0)
-			  .on('spinchange', changeFunction);
+			}).attr('value', activity.offsetMinute || 0)
+			  .on('input', changeFunction);
 			
 			$('.propertiesContentFieldActivityCompletionBased', content)
 				.attr('checked', activity.gateActivityCompletionBased? 'checked' : null);
@@ -325,7 +325,7 @@
 				
 				$('input[name="propertiesContentFieldGroupDivide"]', content).each(function(){
 						// enable/disable division types, depending on radio buttons next to them
-						$(this).next().find('.spinner').spinner('option', 'disabled', !$(this).is(':checked'));
+						$(this).next().find('.spinner').prop('disabled', !$(this).is(':checked'));
 					})
 					// hide group/learner division with some grouping types
 					.add($('.propertiesContentFieldLearnerCount', content).closest('tr'))
@@ -378,15 +378,15 @@
 			}	
 			
 			// create groups/learners spinners
-			$('.propertiesContentFieldGroupCount', content).spinner({
+			$('.propertiesContentFieldGroupCount', content).attr({
 				'min' : 2
-			}).spinner('value', activity.groupCount)
-			  .on('spinchange', changeFunction);
+			}).attr('value', activity.groupCount)
+			  .on('input', changeFunction);
 			
-			$('.propertiesContentFieldLearnerCount', content).spinner({
+			$('.propertiesContentFieldLearnerCount', content).attr({
 				'min' 	   : 1
-			}).spinner('value', activity.learnerCount)
-			  .on('spinchange', changeFunction);
+			}).attr('value', activity.learnerCount)
+			  .on('input', changeFunction);
 			
 			$('.propertiesContentFieldEqualSizes', content).attr('checked', activity.equalSizes ? 'checked' : null);
 			$('.propertiesContentFieldViewLearners', content).attr('checked', activity.viewLearners ? 'checked' : null);
@@ -514,34 +514,34 @@
 			});
 			
 			// min can not be higher than max; neither of them can be higher than children count
-			$('.propertiesContentFieldOptionalActivityMin', content).spinner({'min' : 0})
-			  .on('spinchange', function(){
+			$('.propertiesContentFieldOptionalActivityMin', content).attr({'min' : 0})
+			  .on('input', function(){
 				  var value = +$(this).val();
 				  activity.minOptions = Math.min(value, activity.childActivities.length);
 				  if (value != activity.minOptions) {
-					  $(this, content).spinner('value', activity.minOptions);
+					  $(this, content).attr('value', activity.minOptions);
 				  }
 				  if (activity.minOptions > activity.maxOptions) {
-					  $('.propertiesContentFieldOptionalActivityMax', content).spinner('value', value);
+					  $('.propertiesContentFieldOptionalActivityMax', content).attr('value', value);
 				  }
-				  $('.propertiesContentFieldOptionalActivityMax', content).spinner('option', 'min', value);
+				  $('.propertiesContentFieldOptionalActivityMax', content).attr('min', value);
 			  });
 			
 			
-			$('.propertiesContentFieldOptionalActivityMax', content).spinner({'min' : 0})
-			  .on('spinchange', function(){
+			$('.propertiesContentFieldOptionalActivityMax', content).attr('min', 0)
+			  .on('input', function(){
 				  var value = +$(this).val();
 				  activity.maxOptions = Math.min(value, activity.childActivities.length);
 				  if (value != activity.maxOptions) {
-					  $(this, content).spinner('value', activity.maxOptions);
+					  $(this, content).attr('value', activity.maxOptions);
 				  }
 			  });
 		}
 		
-		$('.propertiesContentFieldOptionalActivityMin', content).spinner('value', activity.minOptions)
-																.spinner('option', 'max', activity.childActivities.length);
-		$('.propertiesContentFieldOptionalActivityMax', content).spinner('value', activity.maxOptions)
-																.spinner('option', {
+		$('.propertiesContentFieldOptionalActivityMin', content).attr('value', activity.minOptions)
+																.attr('max', activity.childActivities.length);
+		$('.propertiesContentFieldOptionalActivityMax', content).attr('value', activity.maxOptions)
+																.attr({
 																	'min' : activity.minOptions,
 																	'max' : activity.childActivities.length
 																});
@@ -1325,9 +1325,9 @@
 		});
 		
 		// initialise spinner widgets
-		$('#singleRangeSpinner, #multiRangeFromSpinner, #multiRangeToSpinner', outputConditionsDialogContents).spinner({
-			'min' : 0,
-		}).spinner('value', 0);
+		$('#singleRangeSpinner, #multiRangeFromSpinner, #multiRangeToSpinner', outputConditionsDialogContents).attr({
+			'min' : 0
+		}).attr('value', 0);
 		
 		$('.modal-body', layout.outputConditionsDialog).empty().append(outputConditionsDialogContents.show());
 		layout.dialogs.push(layout.outputConditionsDialog);
@@ -1765,7 +1765,7 @@
 		if (object.readOnly) {
 			// make all widgets read-only
 			modalBody.find('input, select, textarea').prop('disabled', true);
-			modalBody.find('.spinner').spinner('option', 'disabled', true);
+			modalBody.find('.spinner').prop('disabled', true);
 		}
 		modalBody.find('input').blur();
 		dialog.on('shown.bs.modal', function(){
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java
===================================================================
diff -u -r68d56bcf4ea82273d7d3beb10809cb638d9b4e7d -rd7807c73d8a9c76c44ea1a2a296d5f775afe2ac9
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java	(.../ResourceServiceImpl.java)	(revision 68d56bcf4ea82273d7d3beb10809cb638d9b4e7d)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java	(.../ResourceServiceImpl.java)	(revision d7807c73d8a9c76c44ea1a2a296d5f775afe2ac9)
@@ -804,6 +804,15 @@
 
 	    // reset it to new toolContentId
 	    toolContentObj.setContentId(toolContentId);
+
+	    Set<LearnerItemRatingCriteria> criterias = toolContentObj.getRatingCriterias();
+	    if (criterias != null) {
+		for (LearnerItemRatingCriteria criteria : criterias) {
+		    criteria.setToolContentId(toolContentId);
+		}
+	    }
+
+	    // Calling DAO method below causes flush. That is why we need to reset tool content ID in rating criteria before it happens.
 	    ResourceUser user = resourceUserDao.getUserByUserIDAndContentID(newUserUid.longValue(), toolContentId);
 	    if (user == null) {
 		user = new ResourceUser();
@@ -824,13 +833,6 @@
 		useRatings = useRatings || item.isAllowRating();
 	    }
 
-	    Set<LearnerItemRatingCriteria> criterias = toolContentObj.getRatingCriterias();
-	    if (criterias != null) {
-		for (LearnerItemRatingCriteria criteria : criterias) {
-		    criteria.setToolContentId(toolContentId);
-		}
-	    }
-
 	    resourceDao.saveObject(toolContentObj);
 	} catch (ImportToolContentException e) {
 	    throw new ToolException(e);