MERGE: 2014/12/24 10:11
Merge branch 'master' of https://github.com/wenqf11/FSE

Conflicts:
	facesearch/.idea/workspace.xml
rename function