Merge branch 'develop' of https://github.com/MichMich/MagicMirror into addClassCellCalendar

CHANGELOG.md

@@ -4,10 +4,19 @@ All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
 ---
-## [2.5.0] - Unreleased
+
+## [2.6.0] - Unreleased
 
 *This release is scheduled to be released on 2018-10-01.*
 
+### Added
+
+### Fixed
+
+### Updated
+
+## [2.5.0] - 2018-10-01
+
 ### Added
 - Support multi-line compliments
 - Simplified Chinese translation for "Feels"

README.md

@@ -48,7 +48,9 @@ bash -c "$(curl -sL https://raw.githubusercontent.com/MichMich/MagicMirror/maste
 
 #### Manual Installation
 
-1. Download and install the latest *Node.js* version.
+1. Download and install the latest *Node.js* version:
+- `curl -sL https://deb.nodesource.com/setup_10.x | sudo -E bash -`
+- `sudo apt install -y nodejs`
 2. Clone the repository and check out the master branch: `git clone https://github.com/MichMich/MagicMirror`
 3. Enter the repository: `cd MagicMirror/`
 4. Install and run the app with: `npm install && npm start` \

package-lock.json

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

package.json

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