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/linux/avr-gcc-4.8.1-arduino5-i686-pc-linux-gnu.tar.bz2.sha

@@ -0,0 +1 @@
+fdd09172450c3970a55e1876d1fc112d0db626ac

build/linux/avr-gcc-4.8.1-arduino5-x86_64-pc-linux-gnu.tar.bz2.sha

@@ -0,0 +1 @@
+0398e498559c42e45cb98ba13251da7e5b306e0c

build/linux/avr-toolchain-linux32-3.4.5.zip.sha

@@ -1 +0,0 @@
-7be134b7daae4160f069725ab4924759c213b171

build/linux/avr-toolchain-linux64-3.4.5.zip.sha

@@ -1 +0,0 @@
-0c4f955273ba09fe9a5a9bd90b2e8713295ba4b4

build/linux/avrdude-6.0.1-arduino5-i686-pc-linux-gnu.tar.bz2.sha

@@ -0,0 +1 @@
+cf859c679713cae2f1b9089d797d211dd84fe658

build/linux/avrdude-6.0.1-arduino5-x86_64-pc-linux-gnu.tar.bz2.sha

@@ -0,0 +1 @@
+cfc52036f532c3a7050f6d4ec7645d060800aa39

build/linux/dist/arduino

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 CURDIR=`pwd`
 APPDIR="$(dirname -- "$(readlink -f -- "${0}")" )"
@@ -20,5 +20,13 @@ export LD_LIBRARY_PATH
 
 export PATH="${APPDIR}/java/bin:${PATH}"
 
-java -Dswing.defaultlaf=com.sun.java.swing.plaf.gtk.GTKLookAndFeel processing.app.Base --curdir $CURDIR "$@"
+if [[ "$@" == *"--upload"* || "$@" == *"--verify"* || "$@" == *"--get-pref"* || "$@" == *"--install-board"* || "$@" == *"--install-library"* ]] ; then
+	SPLASH=""
+else
+	SPLASH="-splash:./lib/splash.png"
+fi
+
+export JAVA_TOOL_OPTIONS=`echo $JAVA_TOOL_OPTIONS | sed 's|-javaagent:/usr/share/java/jayatanaag.jar||g'`
+
+java -Dswing.defaultlaf=com.sun.java.swing.plaf.gtk.GTKLookAndFeel $SPLASH processing.app.Base --curdir $CURDIR "$@"
 

build/linux/dist/arduino.desktop

@@ -3,8 +3,8 @@ Type=Application
 Name=Arduino IDE
 GenericName=Integrated Development Environment
 Comment=An IDE for Arduino-compatible electronics prototyping platforms
-Exec=arduino
-Icon=arduino
+Exec=FULL_PATH/arduino
+Icon=FULL_PATH/lib/arduino.png
 Terminal=false
 Categories=Development;IDE;Electronics;
 MimeType=text/x-arduino

build/linux/dist/install.sh

@@ -0,0 +1,17 @@
+#!/bin/sh
+
+CURDIR=`pwd`
+APPDIR="$(dirname -- "$(readlink -f -- "${0}")" )"
+
+cd "$APPDIR"
+
+# Set arduino.desktop absolute path workaround
+mv arduino.desktop arduino.desktop-bak
+sed -e "s,FULL_PATH,$PWD,g" arduino.desktop-bak > arduino.desktop
+rm arduino.desktop-bak
+
+cp arduino.desktop ~/.local/share/applications/arduino.desktop
+cp arduino.desktop ~/Desktop/arduino.desktop
+
+echo "Instaled Arduino IDE icons on menu and desktop !"
+

build/linux/dist/tools/adk2install

@@ -1,14 +0,0 @@
-#!/bin/sh
-
-# simple wrapper around the adk2tool and bossac to properly erase and reset the 
-# adk2 board
-
-echo $1 /dev/$2 erase
-$1 /dev/$2 erase
-
-echo $3 --port=$2 -w -e -v -b $4
-$3 --port=$2 -w -e -v -b $4
-
-echo $1 /dev/$2 reset
-$1 /dev/$2 reset
-