Etherpad is now reachable at /etherpad/i
Merge pull request #2977 from simong/etherpad-nginx

Etherpad is now reachable at /etherpad/0
Update fr_FR.properties
Merge branch 'master' of github.com:oaeproject/3akai-ux
Merge branch 'patch-1' of git://github.com/dooremont/3akai-ux into patch-1
Removed empty lines