merge
Merge branch 'master' of https://github.com/aram-hakobyan/confherm
merge
login some changes layouts