finish catalog part
update
bug fix, add tag function
Merge branch 'master' of https://github.com/YechengZhou/Flask_Blog

Conflicts:
	db/__init__.pyc
	db/db.pyc
	db/orm.pyc
	www/RESTAPI.pyc
	www/__init__.pyc
	www/constant.pyc
	www/models.pyc