search in one thread
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/com/softensity/dao/doc/DocDAOImpl.java
search test
search test