From 7742575cab580d1d66f8c899b488cb7ee2c8c271 Mon Sep 17 00:00:00 2001
From: Malcolm Oakes <malc.oakes@gmail.com>
Date: Wed, 3 Apr 2019 16:16:59 +0100
Subject: [PATCH] Merge latest from develop branch

---
 CHANGELOG.md      | 18 ++++++++++++++++++
 package-lock.json |  2 +-
 package.json      |  2 +-
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1b89b1bc..f1f659b9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,24 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ❤️ **Donate:** Enjoying MagicMirror²? [Please consider a donation!](https://magicmirror.builders/donate) With your help we can continue to improve the MagicMirror² core.
 
+
+## [2.8.0] - Unreleased
+
+*This release is scheduled to be released on 2019-04-01.*
+
+### Added
+Added UK Met Office Datapoint feed as a provider in the default weather module.
+- added new provider class
+- added suncalc.js dependency to calculate sun times (not provided in datapoint feed)
+- added "ukunits": temp in degrees C, wind speed in MPH, precipitation in %
+- use Feels Like temp from feed if present
+- optionally display precipitation in current weather
+
+
+### Updated
+
+### Fixed
+
 ## [2.7.1] - 2019-04-02
 
 Fixed `package.json` version number.
diff --git a/package-lock.json b/package-lock.json
index 3d5c56b3..ad622926 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "magicmirror",
-  "version": "2.7.1",
+  "version": "2.8.0-develop",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 9f61e8bc..a0a27ffe 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "magicmirror",
-  "version": "2.7.1",
+  "version": "2.8.0-develop",
   "description": "The open source modular smart mirror platform.",
   "main": "js/electron.js",
   "scripts": {