提交classpath project
commit classpath
commit ignore
commit settings
commit web setting and classpath
commit error page
commit index file
commit local
Merge branch 'master' of https://github.com/TonyDon/txcms-web.git

Conflicts:
	.classpath
	.project
	.settings/org.eclipse.core.resources.prefs
	.settings/org.eclipse.jdt.core.prefs