implementing logar template, fixin login bar on base.html
fixing merge