fixed weird bug
Merge branch 'master' of github.com:ehzhang/jade

Conflicts:
	apps/common/templates/card.html
Merge branch 'master' of github.com:ehzhang/jade

Conflicts:
	apps/common/templates/card.html