From 6863fababebe088dd47cb84eac0b7d3074d15978 Mon Sep 17 00:00:00 2001
From: cpfeiffer <cpfeiffer@users.noreply.github.com>
Date: Fri, 29 Apr 2016 22:07:16 +0200
Subject: [PATCH] Update changelog and prepare for 0.9.6

---
 CHANGELOG.md                              |  6 ++++++
 app/build.gradle                          |  4 ++--
 app/src/main/res/xml/changelog_master.xml | 23 +++++++++++++++--------
 3 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f375da1ed..285abea9a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,10 @@
 ###Changelog
+####Version (0.9.6)
+* Again some UI/theme improvements
+* New preference to reconnect after connection loss (defaults to true)
+* Fix crash when dealing with certain old preference values
+* Mi Band: automatically reconnect when back in range after connection loss
+* Mi Band 1S: display heart rate value again when invoked via the Debug view
 
 ####Version (0.9.5)
 * Several UI Improvements
diff --git a/app/build.gradle b/app/build.gradle
index c2578c08e..d567c3f32 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -16,8 +16,8 @@ android {
         targetSdkVersion 23
 
         // note: always bump BOTH versionCode and versionName!
-        versionName "0.9.5"
-        versionCode 49
+        versionName "0.9.6"
+        versionCode 50
     }
     buildTypes {
         release {
diff --git a/app/src/main/res/xml/changelog_master.xml b/app/src/main/res/xml/changelog_master.xml
index d7054da26..ab86fe0d9 100644
--- a/app/src/main/res/xml/changelog_master.xml
+++ b/app/src/main/res/xml/changelog_master.xml
@@ -1,14 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <changelog>
+    <release version="0.9.6" versioncode="50">
+        <change>Again some UI/theme improvements</change>
+        <change>New preference to reconnect after connection loss (defaults to true)</change>
+        <change>Fix crash when dealing with certain old preference values</change>
+        <change>Mi Band: automatically reconnect when back in range after connection loss</change>
+        <change>Mi Band 1S: display heart rate value again when invoked via the Debug view</change>
+    </release>
     <release version="0.9.5" versioncode="49">
-	<change>Several UI Improvements</change>
-	<change>Easier First-time setup by using a FAB</change>
-	<change>Optional Dark Theme</change>
-	<change>Notification App Blacklist is now sorted</change>
-	<change>Gadgetbridge Icon in the notification bar displays connection state</change>
-	<change>Logging is now configurable without restart</change>
-	<change>Mi Band 1S: Initial live heartrate tracking</change>
-	<change>Fix certain crash in charts activity on slower devices (#277)</change>
+        <change>Several UI Improvements</change>
+        <change>Easier First-time setup by using a FAB</change>
+        <change>Optional Dark Theme</change>
+        <change>Notification App Blacklist is now sorted</change>
+        <change>Gadgetbridge Icon in the notification bar displays connection state</change>
+        <change>Logging is now configurable without restart</change>
+        <change>Mi Band 1S: Initial live heartrate tracking</change>
+        <change>Fix certain crash in charts activity on slower devices (#277)</change>
     </release>
     <release version="0.9.4" versioncode="48">
         <change>Fix crash in charts activities when changing the date, quickly (#277)</change>