reparat meniu, reparat log out
merge bogdanrn into master