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

Conflicts:
	swappy/docs/info/documento-iteración-3.pdf
	swappy/src/swap/genericusers/views.py
m