2 directions fuzzy query
add timeout
MERGED: 2014/12/26 11:00
Merge branch 'master' of https://github.com/wenqf11/FSE

Conflicts:
	facesearch/.idea/workspace.xml
	facesearch/static/img/1.jpg