singin and login solved
0merge with feature/111