Merge branch 'master' into matthijskooijman-ide-1.5.x-timer-variant

Conflicts:
	app/src/processing/app/debug/Compiler.java
	hardware/arduino/sam/cores/arduino/main.cpp

Author: cmaglie

cores/arduino/main.cpp

@@ -31,13 +31,20 @@ extern void SysTick_Handler( void )
 }
 */
 
+// Weak empty variant initialization function.
+// May be redefined by variant files.
+void initVariant() __attribute__((weak));
+void initVariant() { }
+
 /*
  * \brief Main entry point of Arduino application
  */
 int main( void )
 {
 	init();
 
+	initVariant();
+
 	delay(1);
 
 #if defined(USBCON)

cores/arduino/wiring.h

@@ -26,6 +26,7 @@ extern "C" {
 /**
  *
  */
+extern void initVariant( void ) ;
 extern void init( void ) ;
 
 /**