Merge branch 'master' into ide-1.5.x

Conflicts:
	build/shared/examples/02.Digital/BlinkWithoutDelay/BlinkWithoutDelay.ino
	build/shared/examples/09.USB/Keyboard/KeyboardMessage/KeyboardMessage.ino
	libraries/LiquidCrystal/examples/CustomCharacter/CustomCharacter.ino
	libraries/SD/examples/listfiles/listfiles.ino

Author: cmaglie

examples/02.Digital/BlinkWithoutDelay/BlinkWithoutDelay.ino

@@ -8,30 +8,32 @@
  * LED attached from pin 13 to ground.
  * Note: on most Arduinos, there is already an LED on the board
  that's attached to pin 13, so no hardware is needed for this example.
-
-
+ 
  created 2005
  by David A. Mellis
  modified 8 Feb 2010
  by Paul Stoffregen
-
+ modified 11 Nov 2013
+ by Scott Fitzgerald
+ 
+ 
  This example code is in the public domain.
-
-
+ 
  http://www.arduino.cc/en/Tutorial/BlinkWithoutDelay
  */
 
-// constants won't change. Used here to
-// set pin numbers:
+// constants won't change. Used here to set a pin number :
 const int ledPin =  13;      // the number of the LED pin
 
-// Variables will change:
+// Variables will change :
 int ledState = LOW;             // ledState used to set the LED
-long previousMillis = 0;        // will store last time LED was updated
 
-// the follow variables is a long because the time, measured in miliseconds,
-// will quickly become a bigger number than can be stored in an int.
-long interval = 1000;           // interval at which to blink (milliseconds)
+// Generally, you shuould use "unsigned long" for variables that hold time
+// The value will quickly become too large for an int to store
+unsigned long previousMillis = 0;        // will store last time LED was updated
+
+// constants won't change :
+const long interval = 1000;           // interval at which to blink (milliseconds)
 
 void setup() {
   // set the digital pin as output:
@@ -47,10 +49,10 @@ void loop()
   // the LED is bigger than the interval at which you want to
   // blink the LED.
   unsigned long currentMillis = millis();
-
-  if (currentMillis - previousMillis > interval) {
-    // save the last time you blinked the LED
-    previousMillis = currentMillis;
+ 
+  if(currentMillis - previousMillis >= interval) {
+    // save the last time you blinked the LED 
+    previousMillis = currentMillis;   
 
     // if the LED is off turn it on and vice-versa:
     if (ledState == LOW)

examples/09.USB/Keyboard/KeyboardMessage/KeyboardMessage.ino

@@ -1,22 +1,23 @@
-/*
- Keyboard Button test
-
- For the Arduino Leonardo, Micro and Due boards.
-
+/* 
+ Keyboard Message test
+ 
+ For the Arduino Leonardo and Micro.
+ 
  Sends a text string when a button is pressed.
 
  The circuit:
- * pushbutton attached from pin 2 to +5V on AVR boards
-   and to +3.3V to the Arduino Due
- * 10-kilohm resistor attached from pin 2 to ground
-
+ * pushbutton attached from pin 4 to +5V
+ * 10-kilohm resistor attached from pin 4 to ground
+ 
  created 24 Oct 2011
  modified 27 Mar 2012
  by Tom Igoe
-
+ modified 11 Nov 2013
+ by Scott Fitzgerald
+ 
  This example code is in the public domain.
-
- http://www.arduino.cc/en/Tutorial/KeyboardButton
+ 
+ http://www.arduino.cc/en/Tutorial/KeyboardMessage
  */
 
 const int buttonPin = 4;          // input pin for pushbutton