forked from platformio/platformio-core
* develop: (21 commits) Use stable docs Version bump to 2.11.2 (issues #500, #533, #732, #731, #737, #733, #438, #722, #52, #725) Update project configuration template Use stable docs Implement firmware merging with base firmware for Nordic nRF51 development platform // Resolve #500 , Resolve #533 Fix firmware uploading to Atmel SAMD21-XPRO board using ARM mbed framework // Resolve #732 Add firmware merging process for nordicnrf51 // Issue #533, #500 Add OpenOCD as an alternative upload method for atmelsam platform // Issue #732 Sync flags parser with PlatformIO 3.0 branch // Resolve #738 Update ``udev`` rules for the new STM32F407DISCOVERY boards // Resolve #731 Add explanation about "Failed to find MSBuild toolsets directory" Add support for local "--echo" for Serial Port Monitor // Resolve #733 Update history Improve support for Microchip PIC32 development platform and ChipKIT boards // Resolve #438 Fix Project Generator for ESP8266 and ARM mbed based projects Switch to gcc-built LwIP library for espressif platform Push 2.11.2.dev2 Fix linking process for microchippic32 platfrom // Issue #438 Improve Project Generator for PlatformIO IDE (fixes incorrect linter errors)