Combined user-profile signup works but has some weird bugs.
Merge remote-tracking branch 'origin/master'

Conflicts:
	Couches/models.py
Combined user-profile signup works but has some weird bugs.