Finish user signup
Add SSL in production
Merge branch 'filling-in-layout'

Conflicts:
	.idea/sample_app.iml
	.idea/workspace.xml
Finish user signup