fix some bad line
create templates
modify genericusers
modify solicitudes
modify swap urls
modify swaptransactions
more swaptransactions
modify vals
Merge branch 'master' of https://github.com/teamreactive/swap

Conflicts:
	genericusers/views.py