a backup
Merge branch 'beta' of https://github.com/HITSeSunday/Projects into beta

Conflicts:
	WebRoot/web/s_login.html
	src/webAction/LoginAction.java
	src/webAction/RegAction3.java
	src/webAction/ReserveAction.java

	modified:   WebRoot/META-INF/context.xml
	modified:   WebRoot/web/s_login.html
	modified:   WebRoot/web/s_login.jsp
	deleted:    src/RserverServiceyyj.java
	modified:   src/webAction/LoginAction.java
  modified:   src/webAction/ReserveAction.java