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

Conflicts:
	templates/cans/creationcollection.html