Merge remote-tracking branch 'origin/master' into merge_test

docs/releases/2.1.5.rst

@@ -2,7 +2,7 @@
 Mayan EDMS v2.1.5 release notes
 ===============================
 
-Released: XX, 2016
+Released: November 8, 2016
 
 What's new
 ==========
@@ -21,6 +21,8 @@ Other changes
 - Backport zoom performance improvement (GitLab #334).
 - Backport trash can navigation link resolution fix (GitLab #331).
 - Improve documentation regarding the use of GPG version 1 (GitLab #333).
+- Fix ACL create view HTML response type. (GitLab #335).
+- Expland staging folder and watch folder explanation.
 
 Removals
 --------
@@ -79,5 +81,7 @@ Bugs fixed or issues closed
 * `GitLab issue #331 <https://gitlab.com/mayan-edms/mayan-edms/issues/331>`_ Trash List View: Items actions should be limited
 * `GitLab issue #333 <https://gitlab.com/mayan-edms/mayan-edms/issues/333>`_ "Unable to run gpg - it may not be available."
 * `GitLab issue #334 <https://gitlab.com/mayan-edms/mayan-edms/issues/334>`_ Perfomance improvment: prevent unnecessary image.resize in TransformationZoom
+* `GitLab issue #335 <https://gitlab.com/mayan-edms/mayan-edms/issues/335>`_ Wrong HTML Content-Type in ACL->NEW
+
 
 .. _PyPI: https://pypi.python.org/pypi/mayan-edms/