activity update
Merge remote-tracking branch 'upstream/3.0-dev' into activity

Conflicts:
	Resources/views/Activity/index.html.twig
activity update
Merge remote-tracking branch 'upstream/3.0-dev' into activity
primary resource optional
small fixes
Merge remote-tracking branch 'upstream/3.0-dev' into activity

Conflicts:
	Resources/translations/platform.es.yml
	Resources/translations/platform.fr.yml
Merge pull request #636 from solispauwels/activity

Activity