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

Conflicts:
	media/css/6Cans.css
	templates/cans/home.html
	templates/cans/index.html
	templates/tags/search_form.html