uodates
Merge branch 'master' of https://github.com/senonchen/popcans.git

Conflicts:
	accounts/views.py