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

Conflicts:
	vals/views.py