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
Making it possible to look at other user's profiles
Moved context functionality into function
files for de_DE translation created
Follow up on "uploadnewversion"
Merge branch 'newframework' into userProfiles

Conflicts:
	ui/js/content.js
Create and implement the account preferences widget
Self review
Merge branch 'newframework' into userProfiles

Conflicts:
	ui/js/content.js
Merge remote-tracking branch 'origin/newframework' into createdocument
Merge origin/newframework and fix conflicts
Merge origin/newframework and fix conflicts
Merge remote-tracking branch 'origin/newframework' into accountpreferences
Follow-up on accountpreferences widget
i18n cleanup