孙太明
Merge branch 'master' of https://github.com/TianJianWang/tjian

Conflicts:
	.gitignore
	WebRoot/WEB-INF/classes/com/tianjian/model/Finance.class
	WebRoot/WEB-INF/classes/com/tianjian/model/FinanceItem.class
	WebRoot/WEB-INF/classes/com/tianjian/model/SalePre.hbm.xml
	WebRoot/WEB-INF/classes/com/tianjian/test/Test.class
	WebRoot/WEB-INF/classes/com/tianjian/util/FCKFilter.class
	WebRoot/WEB-INF/classes/hibernate.cfg.xml
	WebRoot/WEB-INF/classes/struts.xml
	WebRoot/WEB-INF/lib/servlet-api.jar
	WebRoot/index.jsp
	src/com/tianjian/model/Finance.java
	src/com/tianjian/model/FinanceItem.java
	src/com/tianjian/model/Project.java
	src/com/tianjian/model/SalePre.hbm.xml
	src/com/tianjian/test/Test.java
	src/com/tianjian/util/FCKFilter.java
	src/hibernate.cfg.xml
	src/struts.xml
OK Pull