Added Settings on navbar
Merge branch 'master' of https://github.com/einherjer-uy/ui-test into mgelos