navbar reworked
merge conflict fix
Merge branch 'master' of https://github.com/MiroslavGannoha/moviepicker
Merge branch 'master' of https://github.com/MiroslavGannoha/moviepicker
Login/logout view fix