Bug Fix EmailActivationTokenGenerator + remove unused import
Bump Version
Merge remote-tracking branch 'upstream/master'

Conflicts:
	users/utils.py