test screeen shot util
test screeen shot util
Merge remote-tracking branch 'origin/master'

Conflicts:
	ifind/search/query.py