merge
Merge branch 'master' of github.com:napplebee/payments

Conflicts:
	tags/models.py
	tags/views.py