更改环境：tomcat7->Java EE 6；jdk：workspace默认
Merge pull request #1 from wxweven/master

更改环境：tomcat7->Java EE 6；jdk：workspace默认
Merge remote-tracking branch 'origin/LXL' into LXL

Conflicts:
	WebRoot/WEB-INF/classes/com/wxweven/action/UserAction.class