Swap object and target for add group member activity back for activitystrea.ms spec
Merge branch 'master' into activity-add-group-member

Conflicts:
	ui/bundles/fr_FR.properties
Merge pull request #2899 from mrvisser/activity-add-group-member

Swap object and target for add group member activity back for activityst...
Merge branch 'master' of github.com:oaeproject/3akai-ux