Merge branch 'master' into esp8266

* master: (414 commits)
  Don't export sketch if the underlying core does not support it. Fixes #3171
  RSyntaxTextArea: using a modified version, tracked at https://github.com/arduino/RSyntaxTextArea. Fixes #3099
  Updated keywords.txt
  New editor on MacOSX: since CMD+J is known as "jump to selection" and the editor has no such feature, CMD+J is disabled on mac. See #3098
  Old Preferences class remains for backwards compatibility as a delegate for PreferencesData
  New Preferences window: renders fine on every OS and it's easier to adapt using NetBeans as visual editor. Fixes #3140
  Remove spawn from exec command
  Removed redundant call to File.deleteIfExists()
  Removed buggy redundant check in FileUtils.deleteIfExists()
  Restored current line/current selected lines display on lower left of the IDE. Fixes #3134
  Updated cursor.ino
  New editor on MacOSX: restored CMD+E for finding selected text
  New editor on MacOSX: CMD+UP/DOWN moves cursor to start or end of sketch. See #3098
  New editor on MacOSX: CMD+BACKSPACE deletes current line until cursor position, ALT+BACKSPACE deletes previous word. See #3098
  ArduinoIDE is in the default package. Removed
  Fixes  #2969:
  Fix Uncategorized warning message
  New editor: ALT+ BACKSPACE deletes next word (OSX only). See #3098
  New editor: ALT+ UP/DOWN move current line only if "editor.advanced" (hidden pref) is true. Fixes #3101
  New editor: mark occurrences enable when "editor.advanced" (hidden pref) is true. Fixes #3102
  ...

Conflicts:
	.gitignore
	build/build.xml
	hardware/esp8266com/esp8266/libraries/ESP8266WiFi/keywords.txt
	hardware/esp8266com/esp8266/libraries/ESP8266WiFi/library.properties
	hardware/esp8266com/esp8266/libraries/ESP8266WiFi/src/ESP8266WiFi.h
	libraries/WiFi/README.adoc
	libraries/WiFi/src/WiFi.cpp
	libraries/WiFi/src/WiFiClient.cpp
	libraries/WiFi/src/WiFiClient.h
	libraries/WiFi/src/WiFiServer.cpp
	libraries/WiFi/src/WiFiUdp.cpp

build/shared/Edison_help_files-1.6.2.zip.sha

@@ -0,0 +1 @@
+07a93ab86dadbb33c0182fc2e3034ed3a24cbec6

build/shared/Galileo_help_files-1.6.2.zip.sha

@@ -0,0 +1 @@
+494881c26e4dc58ab67409d72c3d63e3c52ac184

build/shared/examples/01.Basics/AnalogReadSerial/AnalogReadSerial.txt

@@ -0,0 +1 @@
+Read a potentiometer, print its state out to the Arduino Serial Monitor. 

build/shared/examples/01.Basics/BareMinimum/BareMinimum.txt

@@ -0,0 +1 @@
+The bare minimum of code needed to start an Arduino sketch. 

build/shared/examples/01.Basics/Blink/Blink.txt

@@ -0,0 +1 @@
+Turn an LED on and off. 

build/shared/examples/01.Basics/DigitalReadSerial/DigitalReadSerial.txt

@@ -0,0 +1 @@
+Read a switch, print the state out to the Arduino Serial Monitor.

build/shared/examples/01.Basics/Fade/Fade.txt

@@ -0,0 +1 @@
+Demonstrates the use of analog output to fade an LED.

build/shared/examples/01.Basics/ReadAnalogVoltage/ReadAnalogVoltage.txt

@@ -0,0 +1 @@
+Reads an analog input and prints the voltage to the serial monitor.

build/shared/examples/02.Digital/BlinkWithoutDelay/BlinkWithoutDelay.txt

@@ -0,0 +1 @@
+Blinking an LED without using the delay() function.

build/shared/examples/02.Digital/Button/Button.txt

@@ -0,0 +1 @@
+Use a pushbutton to control an LED. 

build/shared/examples/02.Digital/Debounce/Debounce.txt

@@ -0,0 +1 @@
+Read a pushbutton, filtering noise. 

build/shared/examples/02.Digital/DigitalInputPullup/DigitalInputPullup.txt

@@ -0,0 +1 @@
+Demonstrates the use of INPUT_PULLUP with pinMode(). 

build/shared/examples/02.Digital/StateChangeDetection/StateChangeDetection.txt

@@ -0,0 +1 @@
+Counting the number of button pushes. 

build/shared/examples/02.Digital/toneKeyboard/toneKeyboard.txt

@@ -0,0 +1 @@
+A three-key musical keyboard using force sensors and a piezo speaker. 

build/shared/examples/02.Digital/toneMelody/toneMelody.txt

@@ -0,0 +1 @@
+Play a melody with a Piezo speaker.

build/shared/examples/02.Digital/toneMultiple/toneMultiple.txt

@@ -0,0 +1 @@
+Play tones on multiple speakers sequentially using the tone() command. 

build/shared/examples/02.Digital/tonePitchFollower/tonePitchFollower.txt

@@ -0,0 +1 @@
+Play a pitch on a piezo speaker depending on an analog input. 

build/shared/examples/03.Analog/AnalogInOutSerial/AnalogInOutSerial.txt

@@ -0,0 +1 @@
+Read an analog input pin, map the result, and then use that data to dim or brighten an LED. 

build/shared/examples/03.Analog/AnalogInput/AnalogInput.txt

@@ -0,0 +1 @@
+Use a potentiometer to control the blinking of an LED. 

build/shared/examples/03.Analog/AnalogWriteMega/AnalogWriteMega.txt

@@ -0,0 +1 @@
+Fade 12 LEDs on and off, one by one, using an Arduino Mega board. 

build/shared/examples/03.Analog/Calibration/Calibration.txt

@@ -0,0 +1 @@
+Define a maximum and minimum for expected analog sensor values. 

build/shared/examples/03.Analog/Fading/Fading.txt

@@ -0,0 +1 @@
+Use an analog output (PWM pin) to fade an LED. 

build/shared/examples/03.Analog/Smoothing/Smoothing.txt

@@ -0,0 +1 @@
+Smooth multiple readings of an analog input. 

build/shared/examples/04.Communication/ASCIITable/ASCIITable.txt

@@ -0,0 +1 @@
+Demonstrates Arduino's advanced serial output functions.

build/shared/examples/04.Communication/Dimmer/Dimmer.txt

@@ -0,0 +1 @@
+Move the mouse to change the brightness of an LED. 

build/shared/examples/04.Communication/Graph/Graph.txt

@@ -0,0 +1 @@
+Send data to the computer and graph it in Processing. 

build/shared/examples/04.Communication/Midi/MIDI.txt

@@ -0,0 +1 @@
+Send MIDI note messages serially. 

build/shared/examples/04.Communication/MultiSerialMega/MultiSerialMega.txt

@@ -0,0 +1 @@
+Use two of the serial ports available on the Arduino Mega.

build/shared/examples/04.Communication/PhysicalPixel/PhysicalPixel.txt

@@ -0,0 +1 @@
+Turn a LED on and off by sending data to your Arduino from Processing or Max/MSP.

build/shared/examples/04.Communication/ReadASCIIString/ReadASCIIString.txt

@@ -0,0 +1 @@
+Parse a comma-separated string of ints to fade an LED.

build/shared/examples/04.Communication/SerialCallResponse/SerialCallResponse.txt

@@ -0,0 +1 @@
+Send multiple variables using a call-and-response (handshaking) method. 

build/shared/examples/04.Communication/SerialCallResponseASCII/SerialCallResponseASCII.txt

@@ -0,0 +1 @@
+Send multiple variables using a call-and-response (handshaking) method, and ASCII-encode the values before sending. 

build/shared/examples/04.Communication/SerialEvent/SerialEvent.txt

@@ -0,0 +1 @@
+Demonstrates the use of SerialEvent(). 

build/shared/examples/04.Communication/VirtualColorMixer/VirtualColorMixer.txt

@@ -0,0 +1 @@
+Send multiple variables from Arduino to your computer and read them in Processing or Max/MSP.

build/shared/examples/05.Control/Arrays/Arrays.txt

@@ -0,0 +1 @@
+A variation on the For Loop example that demonstrates how to use an array. 

build/shared/examples/05.Control/ForLoopIteration/ForLoopIteration.txt

@@ -0,0 +1 @@
+Controlling multiple LEDs with a for loop and. 

build/shared/examples/05.Control/IfStatementConditional/IfStatementConditional.txt

@@ -0,0 +1 @@
+How to use an if statement to change output conditions based on changing input conditions. 

build/shared/examples/05.Control/WhileStatementConditional/WhileStatementConditional.txt

@@ -0,0 +1 @@
+How to use a while loop to calibrate a sensor while a button is being read.