version 1.0
Merge branch 'master' of https://github.com/jameslin103/wms

Conflicts:
	WebRoot/WEB-INF/classes/cn/fm/service/user/impl/WmsUserServiceImpl.class
	WebRoot/WEB-INF/classes/cn/fm/web/action/user/LoginAction.class
	src/cn/fm/web/action/user/LoginAction.java
versian 1.0