after logging go back to previous page
Merge remote-tracking branch 'upstream/master'
social-auth: when new user is created, redirect to edit profile page; displays a message to encourage filling in the form
conflict in template_tags.py solved. I don't know why this could not be merged automatically
Merge branch 'master' of https://github.com/comic/comic-django