合并冲突
Merge branch 'master' of https://github.com/bigzhu/shuqian

Conflicts:
	client/bookMark.coffee