Actives
Merge branch 'master' of https://github.com/teamreactive/swap

Conflicts:
	genericusers/views.py