fix bug 768636 move span tag inside of block site_header_nav
Bug 926844 - fix strings not in l10n calls in base.html template
Merge pull request #1309 from pascalchevrel/bug-926844_base_template_l10nify

Bug 926844 - fix strings not in l10n calls in base.html template
Merge pull request #1281 from shansm/headerfix-branch

fix bug 768636 move span.toggle outside of nav element