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

Conflicts:
	media/js/signup.js
	templates/admin_mycans/baseInfoSet.html
Merge branch 'master' of https://github.com/senonchen/popcans