start email redemption
Merge branch 'master' of https://github.com/BeerCoin/beercoin-service

Conflicts:
	beercoin/beercoin/views.py