diff --git a/.drone.yml b/.drone.yml
index b179c56ae..7817b1755 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -8,7 +8,7 @@ pipeline:
     image: nextcloudci/php7.0:php7.0-17
     environment:
       - APP_NAME=deck
-      - CORE_BRANCH=master
+      - CORE_BRANCH=stable14
       - DB=sqlite
     commands:
       # Pre-setup steps
@@ -62,7 +62,7 @@ pipeline:
     image: nextcloudci/php7.0:php7.0-17
     environment:
       - APP_NAME=deck
-      - CORE_BRANCH=master
+      - CORE_BRANCH=stable14
       - DB=sqlite
     commands:
       - wget https://raw.githubusercontent.com/nextcloud/server/master/build/signed-off-checker.php
@@ -87,7 +87,7 @@ pipeline:
     image: nextcloudci/php7.0:php7.0-17
     environment:
       - APP_NAME=deck
-      - CORE_BRANCH=master
+      - CORE_BRANCH=stable14
       - DB=sqlite
     commands:
       - composer install
@@ -99,7 +99,7 @@ pipeline:
     image: nextcloudci/php7.1:php7.1-15
     environment:
       - APP_NAME=deck
-      - CORE_BRANCH=master
+      - CORE_BRANCH=stable14
       - DB=sqlite
     commands:
       - composer install
@@ -111,7 +111,7 @@ pipeline:
     image: nextcloudci/php7.2:php7.2-9
     environment:
       - APP_NAME=deck
-      - CORE_BRANCH=master
+      - CORE_BRANCH=stable14
       - DB=sqlite
     commands:
       - composer install
@@ -144,7 +144,7 @@ pipeline:
     image: nextcloudci/php7.0:php7.0-17
     environment:
       - APP_NAME=deck
-      - CORE_BRANCH=master
+      - CORE_BRANCH=stable14
       - DB=sqlite
     commands:
       # Pre-setup steps
@@ -164,7 +164,7 @@ pipeline:
     image: nextcloudci/php7.1:php7.1-15
     environment:
       - APP_NAME=deck
-      - CORE_BRANCH=master
+      - CORE_BRANCH=stable14
       - DB=sqlite
     commands:
       # Pre-setup steps
@@ -183,7 +183,7 @@ pipeline:
     image: nextcloudci/php7.2:php7.2-9
     environment:
       - APP_NAME=deck
-      - CORE_BRANCH=master
+      - CORE_BRANCH=stable14
       - DB=sqlite
     commands:
       # Pre-setup steps
@@ -202,7 +202,7 @@ pipeline:
     image: nextcloudci/integration-php7.0:integration-php7.0-6
     environment:
       - APP_NAME=deck
-      - CORE_BRANCH=master
+      - CORE_BRANCH=stable14
       - DB=sqlite
     commands:
       # Pre-setup steps
@@ -233,7 +233,6 @@ pipeline:
         TESTS: jsbuild
 matrix:
   include:
-    - TESTS: check-app-compatbility
     - TESTS: check-app-compatbility-13
     - TESTS: check-app-compatbility-14
     - TESTS: signed-off-check
diff --git a/.travis.yml b/.travis.yml
index 47139649c..43e944c7c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,7 +6,7 @@ php:
     - 7.1
     - 7.2
 env:
-    - CORE_BRANCH=master DB=mysql
+    - CORE_BRANCH=stable14 DB=mysql
 
 before_install:
     - wget https://phar.phpunit.de/phpunit-5.7.phar
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 92dc70c47..8ebf4bbb2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,28 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## 0.5.0 - unreleased
+
+### Added
+
+- Activity stream for board and cards
+- Comments on cards
+- Use users locale format on date picker
+- Compact display mode
+- Card title inline editing
+- REST API
+- Empty content view for board lists
+- Undo for card and stack deletion
+- Show tag name on board
+- Notify users about card assignments
+- Add shortcut to assign a card to yourself
+- Improved view for printing
+
+### Fixed
+
+- Accesibility improvements
+- Don't allow empty card titles
+
 ## 0.4.0 - 2018-07-11
 
 ### Added
diff --git a/appinfo/app.php b/appinfo/app.php
index 73ee9a086..0901a2105 100644
--- a/appinfo/app.php
+++ b/appinfo/app.php
@@ -28,7 +28,6 @@
 $app = new \OCA\Deck\AppInfo\Application();
 $app->registerNavigationEntry();
 $app->registerNotifications();
-$app->registerCommentsEntity();
 
 /** Load activity style global so it is availabile in the activity app as well */
 \OC_Util::addStyle('deck', 'activity');
diff --git a/appinfo/info.xml b/appinfo/info.xml
index a38ef87ca..3a0ea7c7a 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -11,10 +11,13 @@
 - 📄 Write down additional notes in markdown
 - 🔖 Assign labels for even better organization
 - 👥 Share with your team, friends or family
+- 📎 Attach files and embed them in your markdown description
+- 💬 Discuss with your team using comments
+- ⚡ Keep track of changes in the activity stream
 - 🚀 Get your project organized
 
 </description>
-    <version>0.5.0-dev4</version>
+    <version>0.5.0-beta1</version>
     <licence>agpl</licence>
     <author>Julius Härtl</author>
     <namespace>Deck</namespace>
@@ -29,7 +32,7 @@
     <screenshot>https://download.bitgrid.net/nextcloud/deck/screenshots/Deck_Board.png</screenshot>
     <screenshot>https://download.bitgrid.net/nextcloud/deck/screenshots/Deck_Details.png</screenshot>
     <dependencies>
-        <nextcloud min-version="13" max-version="15" />
+        <nextcloud min-version="13" max-version="14" />
     </dependencies>
     <background-jobs>
         <job>OCA\Deck\Cron\DeleteCron</job>
diff --git a/js/service/ActivityService.js b/js/service/ActivityService.js
index c8da9fd37..6a57c1613 100644
--- a/js/service/ActivityService.js
+++ b/js/service/ActivityService.js
@@ -154,7 +154,7 @@ class ActivityService {
 		}
 		if (typeof this.since[type][id] === 'undefined') {
 			this.since[type][id] = {
-				latest: 0,
+				latest: -1,
 				oldestCatchedUp: false,
 				oldest: '0',
 				finished: false,
diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php
index 62fbb19a7..918653b8a 100644
--- a/lib/AppInfo/Application.php
+++ b/lib/AppInfo/Application.php
@@ -99,6 +99,8 @@ public function __construct(array $urlParams = array()) {
 			}
 		});
 
+		$this->registerCommentsEntity();
+
 	}
 
 	public function registerNavigationEntry() {