Translations onto templates
conflict resolution
Merge pull request #71 from wasade/help_request_touchup

Translations onto templates