可能有冲突，先commit一下
Merge branch 'client' of github.com:slixurd/tNotes into client

Conflicts:
	client/tnotessearchtool.cpp