Finish user signup
Fixing merge conflict
Fixing merge conflict
Add SSL in production