fix a bug
Merge branch 'temp'
fix a bug
Conflicts:
	mytalk/templates/mytalk/header.html