2014.8.18 zqh
Merge branch 'master' of https://github.com/wantdo/wantnew.git

Conflicts:
	WebRoot/index.jsp
	src/com/wantdo/action/CusBackstageAction.java
	src/com/wantdo/test/DaoTest.java
Merge branch 'master' of https://github.com/wantdo/wantnew.git