1、球房入驻模块的功能添加 2、上传展示图片
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	src/main/java/com/huake/web/controller/mgr/MemberController.java
	src/main/webapp/WEB-INF/views/index/index.jsp
	target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
	target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	src/main/java/com/huake/web/controller/mgr/MemberController.java
	src/main/webapp/WEB-INF/views/index/index.jsp
	target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
	target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst