Fixes #262.
Merge branch 'master' into userprofile_cascade_on_user_delete

Conflicts:
	localwiki/users/signals.py
Merge pull request #543 from philipn/userprofile_cascade_on_user_delete

Fixes #262.