平安夜代码，啊玉以后记得你的input用了disable 一定一定要加<s:hidden name=XXXX>,不然就泪奔了
Merge branch 'master' of https://github.com/PrincessHong/may

Conflicts:
	KINGMAY/WebRoot/WEB-INF/applicationContext-common.xml
	KINGMAY/WebRoot/WEB-INF/classes/com/kingmay/adminlogin/control/AdminLoginAction.class
	KINGMAY/WebRoot/WEB-INF/classes/com/kingmay/db/DBCon.class
	KINGMAY/WebRoot/WEB-INF/classes/com/kingmay/user/control/UserLoginAction.class
	KINGMAY/src/com/kingmay/adminlogin/control/AdminLoginAction.java
	KINGMAY/src/com/kingmay/user/control/UserLoginAction.java
	KINGMAY/src/com/kingmay/usercontrol/control/ShowMarkCountAction.java