settings
Merge remote-tracking branch 'origin/master'

Conflicts:
	pixtch/uppo/models.py
login last time