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

Conflicts:
	templates/tags/header.html