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

Conflicts:
	media/js/signin.js
	templates/tags/header.html