Merge branch 'develop' into patch-1

CHANGELOG.md

@@ -4,14 +4,17 @@ All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
 ---
-## [2.5.1] - 2018-10-08
+
+## [2.6.0] - Unreleased
+
+*This release is scheduled to be released on 2018-10-01.*
 
 ### Added
 - added `showEnd` documentation
 
 ### Fixed
 
-
+### Updated
 
 ## [2.5.0] - 2018-10-01
 

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "magicmirror",
-  "version": "2.5.0",
+  "version": "2.6.0-dev",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "magicmirror",
-  "version": "2.5.0",
+  "version": "2.6.0-dev",
   "description": "The open source modular smart mirror platform.",
   "main": "js/electron.js",
   "scripts": {