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

Conflicts:
	Resources/translations/platform.fr.yml
Merge remote-tracking branch 'upstream/3.0-dev' into activity

Conflicts:
	Manager/ActivityManager.php
Merge pull request #651 from solispauwels/activity

Activity update (remove primary resource)
Merge remote-tracking branch 'upstream/3.0-dev' into font-awesome