Merge branch 'Hilary' into uiBasicAdmin
use define() instead of require() in plugins
Merge pull request #2557 from nicolaasmatthijs/uiBasicAdmin

Admin UI
Merge remote-tracking branch 'origin/Hilary' into issue-2552
Prevent template error when no results are found in search all
Fixes per comment on Github
Lingering title that needs safeUserInput
Merge pull request #2558 from nicolaasmatthijs/SearchAllNoResults

Search all error
Follow-up for global admin
Merge branch 'Hilary' of github.com:sakaiproject/3akai-ux into Hilary
Show profile pics on user.html and group.html
Merge pull request #2559 from nicolaasmatthijs/profilePics

Show profile pics on user.html and group.html
Progress on content entity
Merge origin/Hilary and fix conflicts
Extensions to sharecontent
Merge branch 'issue-2552' of git://github.com/bp323/3akai-ux into contentEntity

Conflicts:
	node_modules/oae-core/sharecontent/js/sharecontent.js
Fixed floating issue in Chrome.
Added the picture to the comment box.
Changed small to medium picture in the comments tree.
Added the picture to the reply box.