bug修改
bug�޸�
Merge branch 'master' of https://github.com/HtmlCook/zonday

Conflicts:
	app/models/tag.py