user sign up and login
Merge origin/master