Update README and CHANGELOG

2 files changed, 49 insertions, 9 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 979fb7c9..6d1deb86 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,38 @@
+# v0.11.1 Upcoming Wekan release
+
+2017-01-29 mquandalle gave Wekan access to xet7,
+so at 2017-01-31 xet7 started merging Wefork back to Wekan.
+At 2017-02-03 all Wefork code and pull requests are now
+merged back to Wekan.
+
+This release adds the following supported platforms:
+
+* Docker;
+* Docker on SLES12SP1.
+
+and adds the following new features:
+
+* Checklists;
+* Remove a list.
+
+and fixes the following bugs:
+
+* Typos in boards.js and boardHeader.js;
+* Build warning in jade template;
+* Using older version of MongoDB because of newer
+  version breaks uploading files and avatars.
+
+and adds the following new documentation to Wefork wiki,
+to be moved to Wekan wiki:
+
+* Developer Documentation
+* Docker
+* Docker NginxProxy
+
+Thanks to GitHub users BaobabCoder, jLouzado, lkisme, mario-orlicky,
+martingabelmann, mquandalle, stephenmoloney, umbertooo, xet7 and
+qge for their contributions.
+
 # v0.11.0 2016-12-16 Wekan fork first release
 
 This release adds the following new features:
diff --git a/README.md b/README.md
index 9d0f8235..483b11f3 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,10 @@
 # Wekan
 
-[![Join the chat][gitter_badge]][gitter_chat]
+[![JOIN OFFICIAL WEKAN CHAT][gitter_badge]][gitter_chat]
 
-2017-01-31 News: Wekan fork/Wefork is being merged back to official Wekan.
+2017-02-03 News: All Wekan fork/Wefork code and pull requests has been
+merged back to official Wekan. Wefork will not accept new pull requests
+and issues to Wefork. All development happens on Wekan.
 
 [Wefork announcement and merging back][fork_announcement]
 
@@ -12,9 +14,9 @@
 
 [Wefork FAQ][fork_faq]
 
-[Newer Wefork translations at Transifex][translate_wefork]
+[Translate Wekan using newer Wefork translations at Transifex][translate_wefork]
 
-[Wekan at Transifex][translate_wekan]
+[Not in use yet: Old Wekan translations at Transifex][translate_wekan]
 
 Wekan is an open-source and collaborative kanban board application.
 
@@ -37,8 +39,8 @@ Newer [Wefork GitHub issues][wefork_issues] will be be moved to there also.
 [![Screenshot of Wefork][screenshot_wefork]][roadmap_wefork]
 
 Wekan supports most features you would expect of it including a real-time user
-interface, cards comments, member assignations, customizable labels, filtered
-views, and more.
+interface, cards comments, checklists, member assignations, customizable labels,
+closing lists, filtered views, and more.
 
 Since it is a free software, you don’t have to trust us with your data and can
 install Wekan on your own computer or server. In fact we encourage you to do
@@ -46,9 +48,8 @@ that by providing one-click installation on various platforms.
 
 ## Supported Platforms
 
-[Install from source][install_source]
-
-[VirtualBox][virtualbox]
+Newest features are already at dockerhub images by automatically generated
+trusted build. Other platforms are not up-to-date yet.
 
 ### Docker: [Docker image][docker_image], [Docs][docker_docs], [Docker Nginx proxy][docker_nginxproxy], [Docker Issue][docker_issue]
 
@@ -83,6 +84,10 @@ docker run -d --restart=always --name wekan --link "wekan-db:db" -e "MONGO_URL=m
 
 [Docker on SUSE Linux Enterprise Server 12 SP1][sles]
 
+[Install from source][install_source]
+
+[VirtualBox][virtualbox]
+
 [Debian Wheezy 64bit][debian_wheezy]
 
 [![Deploy][heroku_button]][heroku_deploy]