merged navbar information with master
change logout link
added en example
Merge branch 'master' into feature/tabs