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

Conflicts:
	solicitudes/views.py