Add a Trimpath modifier that replaces a profilePath with '/me' if the passed in profilePath matches the one for the current logged in user
Only rerender image on profile pic update, not the whole thumbnail
Merge origin/bootstrap3 and fix conflicts
Merge branch 'bootstrap3' of https://github.com/sakaiproject/3akai-ux into issue-3596
Follow up on update picture review
Add some margin to error pages
Split the delete comment modal out into its own widget
Merge pull request #3685 from nicolaasmatthijs/issue-3685

Error pages should have padding on small screens
make markdown-pre-code blocks use whitespace: pre
Synchronized Terms and Conditions
Merge branch 'master' of https://github.com/oaeproject/3akai-ux
Fix regression where current version of a file could be restored
Merge branch 'revisionRestoreRegression' of https://github.com/bp323/3akai-ux into revisionRestoreRegression
Merge branch 'issue-3660' of https://github.com/stuartf/3akai-ux into issue-3660
Merge branch 'master' of https://github.com/oaeproject/3akai-ux into issue-3684
Follow up on deletecomment review
Synched latest translations
Reset comments bundles
Merge branch 'master' of https://github.com/oaeproject/3akai-ux into issue-3684
Move keys around from comments to global or deletecomment