过滤重复tag
Merge branch 'master' of https://github.com/bigzhu/shuqian

Conflicts:
	client/bookMarkDetail.coffee