5/18 ming
Merge branch 'master' of https://github.com/TianJianWang/tjian into Branch_master

Conflicts:
	.settings/com.genuitec.eclipse.core.prefs
	.settings/org.eclipse.core.resources.prefs
	WebRoot/WEB-INF/classes/com/tianjian/action/ProjectAction.class
	WebRoot/WEB-INF/classes/com/tianjian/service/ProjectService.class