Fix merge conflict.
Fix merge conflicts.
Mak elogo link a link_to to keep track of current locale.
Translate new registration form.

TODO:
- email message
- confirmation message
Merge pull request #42 from benichu/master

Website translated in french, with all upstream conflicts resolved.