navbar
Fix conflict
Merge branch 'master' of github.com:dizballanze/debugmail