room file bug fixed
Merge branch 'master' of https://github.com/qqfish/haijiao

Conflicts:
	src/java/com/haijiao/Domain/bean/BaseBean.java
	web/.DS_Store
	web/resetPassword.jsp