merge conflicts

Author: bradrobertson

src/scrollable/scrollable.autoscroll.js

@@ -56,6 +56,8 @@
 				// do not start additional timer if already exists
 				if (timer) { return; }
 
+				stopped = false;
+				
         root.bind('onSeek', scroll);
         scroll();
 			};	
@@ -65,15 +67,20 @@
         root.unbind('onSeek', scroll);
 			};
 
-			// Original intention is to have stop not restart on hover
-      // this doesn't appear to be ever have been implemented, can implement if requested
+			// resume playing if not stopped
+			api.resume = function() {
+				stopped || api.play();
+			};
+			
+			// when stopped - mouseover won't restart 
 			api.stop = function() {
+			  stopped = true;
 				api.pause();
 			};
 
 			/* when mouse enters, autoscroll stops */
 			if (opts.autopause) {
-				root.add(api.getNaviButtons()).hover(api.pause, api.play);
+				root.add(api.getNaviButtons()).hover(api.pause, api.resume);
 			}
 
 			if (opts.autoplay) {

src/validator/validator.js

@@ -228,7 +228,7 @@
 		return numRe.test(v);			
 	});
 
-	v.fn("[max]", "Please enter a value smaller than $1", function(el, v) {
+	v.fn("[max]", "Please enter a value no larger than $1", function(el, v) {
 
 		// skip empty values and dateinputs
 		if (v === '' || dateInput && el.is(":date")) { return true; }	
@@ -237,7 +237,7 @@
 		return parseFloat(v) <= parseFloat(max) ? true : [max];
 	});
 
-	v.fn("[min]", "Please enter a value larger than $1", function(el, v) {
+	v.fn("[min]", "Please enter a value of at least $1", function(el, v) {
 
 		// skip empty values and dateinputs
 		if (v === '' || dateInput && el.is(":date")) { return true; }