Merge remote-tracking branch 'origin/stable'

CHANGELOG.md

@@ -4,18 +4,22 @@ Version 1.5.1
 
 - [report activity count] fix error: do not show centers which are not selected in results.
 
-`master branch` 2
-=================
-
-- [report activity]: add aggregator for activity users
-- fix bug: error when extracting activities without filter / aggregators selecting persons
-
-Master branch
+Version 1.5.2
 =============
 
 - [aggregate by activity type] fix translation in aggregate activity type
 - fix some translation in export
 - fix error when persons not loaded by other aggregators / filters
 - add "filter by activity type" filter
+
+Version 1.5.3
+=============
+
 - add privacy events to activity list / show / edit
 
+`master branch`
+===============
+
+- [report activity]: add aggregator for activity users
+- fix bug: error when extracting activities without filter / aggregators selecting persons
+