Etherpad integration
Etherpad widget refinements
Merge remote-tracking branch 'origin/newframework' into etherpad
etherpad fixes: hide edit by default, catch empty html returning.
Added the createcollabdoc widget
Follow up on createcollabdoc review
Create and implement the changepic widget
Making it possible to look at other user's profiles
Moved context functionality into function
Merge remote-tracking branch 'origin/newframework' into changepic
Optimizations and changes per code review for the changepic widget
changepic image resolution fixes
Merge remote-tracking branch 'origin/newframework' into changepic
Refresh picture when uploading a new one, CSS changes to the picture preview box.
files for de_DE translation created
Follow up on "uploadnewversion"
Merge branch 'newframework' into userProfiles

Conflicts:
	ui/js/content.js
Follow up on changepic review
Fix error when deleting content comment
Create and implement the account preferences widget