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

Conflicts:
	ui/bundles/fr_FR.properties
French update preapse 100% with properties files;-)
Fix for titles cut off in Safari
Fix issue in i18n API.
French update follow-up fixes
Merge branch 'master' of github.com:oaeproject/3akai-ux
Merge branch 'titles' of git://github.com/bp323/3akai-ux into titles
Merge pull request #2899 from mrvisser/activity-add-group-member

Swap object and target for add group member activity back for activityst...
Tile overflow
Merge branch 'master' of github.com:oaeproject/3akai-ux
Merge branch 'groupi18n' of git://github.com/bp323/3akai-ux into groupi18n
Adding Italian translation
Close h4 tag in comments.
Merge branch 'comments' of git://github.com/bp323/3akai-ux into comments
Hidding the Etherpad iFrame when unloading the page
Use $rootel in etherpad.js
Merge remote-tracking branch 'origin/master' into editableJump