delete
Merge branch 'master' of https://github.com/Zuohr/cfs.git

Conflicts:
	cfs/WebContent/WEB-INF/web.xml
	cfs/src/pentagon/cfs/controller/Controller.java