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

Conflicts:
	cans/views.py
	templates/cans/home.html
	templates/tags/base_info_set.html