merge

merge
Merge branch 'client' of https://github.com/slixurd/tNotes into client

Conflicts:
	client/tnotesbookcategory.h
	client/tnotesbookcategorylist.h