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

Conflicts:
	accounts/utils/__init__.pyc
	cans/urls.pyc
	cans/utils/__init__.pyc
	templates/base.html