Synchronized French and Chinese translations
 3887 - Comment tree fix
Users should not automatically be added as managers when creating folders
(issue #3889) adjust margins in embedded markdown
Removed inactive pill style
Switch back to using ghosts for the share widget
Refactored _findReply into _findParent in the activity adapter
Merge branch '3887-comment-tree' of https://github.com/simong/3akai-ux into 3887-comment-tree
Merge branch 'master' into issue-3891
Fixed JSDocs typo in upload widget
Merge pull request #3891 from nicolaasmatthijs/issue-3891

Folder behaviour improvements
Merge branch 'master' of https://github.com/oaeproject/3akai-ux into issue3890

Conflicts:
	node_modules/oae-core/setpermissions/js/setpermissions.js
resolve merge conflict