fix bug
singin and login solved
0merge with feature/111
Merge branch 'master' into stage