added signin
Merge branch 'dev'