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

Conflicts:
	templates/admin_mycans/baseInfoSet.html