Fix markup in templates.
Fix translation conflicts.
Update German translations.
Add French translations.
Add English translations.
Merge pull request #22 from 4teamwork/jone-translations

Update translations