Merge pull request #43 from HollyDAI/xr

Merge pull request #38 from HollyDAI/master
Merge pull request #44 from HollyDAI/master

5.13
Merge pull request #47 from HollyDAI/2c

2c 上传的文件，登陆注册
Merge pull request #48 from HollyDAI/master

5.14
5.14整合
Merge pull request #50 from HollyDAI/xr

Xr
Merge pull request #52 from HollyDAI/master

Merge pull request #50 from HollyDAI/xr
Merge pull request #51 from HollyDAI/2c

登陆注册功能上传
web.xml
Merge branch 'xr' of https://github.com/HollyDAI/seweb.git into xr
Merge pull request #53 from HollyDAI/master

5.14
web.xml
Merge branch 'xr' of https://github.com/HollyDAI/seweb.git into xr
二手展示
再重新改一次
Merge pull request #54 from HollyDAI/xr

Xr
Merge branch 'master' of local repository into 2c

Conflicts:
	WebRoot/index.jsp
	WebRoot/platform.jsp