local querydb change
Merge branch 'master' of https://github.com/puyuan/image-journal

Conflicts:
	querydb.py
merge querydb