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

Conflicts:
	cans/personal_index.py
	cans/urls.py