Make setpermissions a bit more abstract, follow up on setpermissions review
Remove unneeded media queries from oae.base.css
Merge branch 'bootstrap3' of https://github.com/sakaiproject/3akai-ux into issue-3596
Follow up on update picture review
Merge origin/bootstrap3 and fix conflicts
Merge origin/bootstrap3 and fix conflicts
(Issue 3392) Increase member well height, fix display name links
Merge remote-tracking branch 'origin/bootstrap3' into issue-3392

Conflicts:
	shared/oae/css/oae.components.css
(Issue 3618) Give min height and width to notifications for loading spinner
Follow up on activity improvements
Small comment follow-up
Set 'neverSubmit' to true in the autosuggest
Merge pull request #3618 from mrvisser/issue-3618

Notifications loading phase (spinner) doesn't look right
(Issue 3629) Reduce badge line-height to fix issue with uncenteredness in Safari iOS
Move product video out of the modal into the index page
(Issue #3556) Add reference to r.js pull request that supports saner CSS optimization options
(Issue #3556) Add note to keep font URL synchronized with build optimization options
(Issue #3556) Add note re: installing fonts for local development
Merge origin/bootstrap3 and fix conflicts
(Issue 3392) Fix 'remove' button positioning, qunit test failure