delete rateDaoTest.java file
Merge remote-tracking branch 'origin/master'

Conflicts:
	biz/src/test/java/com/xiaoquliving/rating/impl/RateDaoImplTest.java
fix bug in uploadfile process
Merge remote-tracking branch 'origin/master'