fix bugs
Merge branch 'master' of https://github.com/mengdiwang/cloud9
Merge branch 'master' of https://github.com/mengdiwang/cloud9

Conflicts:
	lib/Core/Searcher.cpp