Merge remote-tracking branch 'origin/develop' into develop

CHANGELOG.md

@@ -8,6 +8,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ### [2.22.0] - 2018-xx-xx
 - See https://github.com/nextcloud/ios/milestone/32
 
+### [2.22.1] - 2018-xx-xx
+- See https://github.com/nextcloud/ios/milestone/33
+
 ## [2.21.0] - 2018-06-01
 - See https://github.com/nextcloud/ios/milestone/31