Merge branch 'master' into dev

Conflicts:
	CHANGELOG.md

CHANGELOG.md

@@ -10,6 +10,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ### Changed
 - Using default client_id provided by AsyncMqttClient
 
+## [1.3.1] 2016-12-31
+### Fixed
+- data_dir fix for PlatformIO
+
 ## [1.3.0] 2016-12-30
 ### Changed
 - Arduino IDE support (changes in the folder structure and documentation)

README.md

@@ -4,7 +4,7 @@ ESPurna ("spark" in Catalan) is a custom firmware for ESP8266 based smart switch
 It was originally developed with the **[IteadStudio Sonoff][1]** in mind but now it supports a growing number of ESP8266-based boards.
 It uses the Arduino Core for ESP8266 framework and a number of 3rd party libraries.
 
-**Current Release Version is 1.3.0**, read the [changelog](CHANGELOG.md).
+**Current Release Version is 1.3.1**, read the [changelog](CHANGELOG.md).
 
 ## Features
 

code/espurna/config/version.h

@@ -1,4 +1,4 @@
 #define APP_NAME                "ESPurna"
-#define APP_VERSION             "1.3.0"
+#define APP_VERSION             "1.3.1"
 #define APP_AUTHOR              "xose.perez@gmail.com"
 #define APP_WEBSITE             "http://tinkerman.cat"

code/html/fsversion

@@ -1 +1 @@
-1.3.0
+1.3.1

code/platformio.ini

@@ -1,6 +1,7 @@
 [platformio]
 env_default = node-debug
 src_dir = espurna
+data_dir = espurna/data
 
 [common]
 lib_deps =