Complete user signup
Merge branch 'dev'