0518
Merge branch 'master' of https://github.com/TianJianWang/tjian

Conflicts:
	.settings/org.eclipse.core.resources.prefs
	WebRoot/WEB-INF/classes/com/tianjian/action/ProjectAction.class
	WebRoot/WEB-INF/classes/com/tianjian/dao/ProjectDao.class
	WebRoot/WEB-INF/classes/com/tianjian/service/ProjectService.class
	WebRoot/WEB-INF/classes/com/tianjian/test/Test.class
	WebRoot/index.jsp
	src/com/tianjian/action/ProjectAction.java
	src/com/tianjian/test/Test.java