modify on 5-18
Merge remote-tracking branch 'origin/master'
modify by 5-20
Merge remote-tracking branch 'choose_remote_name/master'

Conflicts:
	src/com/ow/DBDao.java
	src/com/ow/dto/RecommendInfoDto.java
	src/config.properties
为了解决冲突
sss