Etherpad integration
Etherpad widget refinements
Merge remote-tracking branch 'origin/newframework' into etherpad
etherpad fixes: hide edit by default, catch empty html returning.
Merge branch 'etherpad' of git://github.com/bp323/3akai-ux into etherpad
Simplifying etherpad widget
Cleaned up etherpad widget and made activity work with collaborative docs
Remove unused CSS
Change nginx.conf to use websockets by default
Merge branch 'newframework' into etherpad
Followed up on review
Create fr_FR.properties
Update manifest.json

add fr_FR.properties
Removing trailing space
Merge pull request #2796 from nicolaasmatthijs/etherpad

Etherpad integration