carrying over top-bar template changes
Merge pull request #7 from kobotoolbox/topbar-template-updates

carrying over top-bar template changes