one fist commit 2013-08-02
Merge branch 'master' of https://github.com/jameslin103/wms

Conflicts:
	wms/.classpath
	wms/WebRoot/META-INF/MANIFEST.MF
	wms/WebRoot/WEB-INF/classes/META-INF/persistence.xml
	wms/WebRoot/WEB-INF/classes/beans.xml
	wms/WebRoot/WEB-INF/classes/cn/fm/bean/user/ContactInfo.class
	wms/WebRoot/WEB-INF/classes/cn/fm/service/base/DaoSupport.class
	wms/WebRoot/WEB-INF/classes/jdbc.properties
	wms/WebRoot/WEB-INF/classes/log4j.properties
	wms/WebRoot/WEB-INF/classes/struts.xml
	wms/WebRoot/WEB-INF/web.xml
	wms/WebRoot/css/styles.css
	wms/WebRoot/js/angular.min.js
	wms/WebRoot/js/jquery-1.10.2.src.js
	wms/WebRoot/js/jquery-1.3.2.min.js
	wms/src/META-INF/persistence.xml
	wms/src/beans.xml
	wms/src/cn/fm/bean/user/ContactInfo.java
	wms/src/cn/fm/service/base/DaoSupport.java
	wms/src/jdbc.properties
	wms/src/struts.xml