index on master: e9797bf User registration works (TODO: profile picture doesn't work)
WIP on master: e9797bf User registration works (TODO: profile picture doesn't work)
Merge commit '0361979'

Conflicts:
	.gitignore
	flats/models.pyc
	flats/views.pyc
	tasklist/settings.pyc