home
Merge remote-tracking branch 'origin/master'

Conflicts:
	.metadata/.log

	.metadata/.plugins/org.eclipse.core.resources/.projects/FirstJspServletJsp/org.eclipse.jdt.core/state.dat

	.metadata/.plugins/org.eclipse.core.resources/.projects/FirstJspServletJsp/org.eclipse.wst.jsdt.core/state.dat

	.metadata/.plugins/org.eclipse.core.resources/.projects/Servlet7_add_DAO/org.eclipse.jdt.core/state.dat

	.metadata/.plugins/org.eclipse.core.resources/.projects/Servlet7_add_DAO/org.eclipse.wst.jsdt.core/state.dat

	.metadata/.plugins/org.eclipse.core.resources/.projects/Servlet7_sql/org.eclipse.jdt.core/state.dat

	.metadata/.plugins/org.eclipse.core.resources/.projects/Servlet7_sql/org.eclipse.wst.jsdt.core/state.dat

	.metadata/.plugins/org.eclipse.core.resources/.projects/Servlet8_JSP/org.eclipse.jdt.core/state.dat

	.metadata/.plugins/org.eclipse.core.resources/.projects/Servlet8_JSP/org.eclipse.wst.jsdt.core/state.dat

	.metadata/.plugins/org.eclipse.core.resources/.projects/Servlet_3_4/org.eclipse.jdt.core/state.dat

	.metadata/.plugins/org.eclipse.core.resources/.projects/Servlet_3_4/org.eclipse.wst.jsdt.core/state.dat

	.metadata/.plugins/org.eclipse.core.resources/.projects/Servlet_5_add_include_forward/org.eclipse.jdt.core/state.dat

	.metadata/.plugins/org.eclipse.core.resources/.projects/Servlet_5_add_include_forward/org.eclipse.wst.jsdt.core/state.dat

	.metadata/.plugins/org.eclipse.core.resources/.projects/Servlet_5_graph/org.eclipse.jdt.core/state.dat

	.metadata/.plugins/org.eclipse.core.resources/.projects/Servlet_5_graph/org.eclipse.wst.jsdt.core/state.dat

	.metadata/.plugins/org.eclipse.core.resources/.projects/Servlet_6_cookie/org.eclipse.jdt.core/state.dat

	.metadata/.plugins/org.eclipse.core.resources/.projects/Servlet_6_cookie/org.eclipse.wst.jsdt.core/state.dat

	.metadata/.plugins/org.eclipse.core.resources/.projects/e_05_sax_simple_example/org.eclipse.jdt.core/state.dat

	.metadata/.plugins/org.eclipse.core.resources/.projects/engine/org.eclipse.jdt.core/state.dat

	.metadata/.plugins/org.eclipse.core.resources/.projects/engine/org.eclipse.wst.jsdt.core/state.dat

	.metadata/.plugins/org.eclipse.core.resources/.projects/jsp500/org.eclipse.jdt.core/state.dat

	.metadata/.plugins/org.eclipse.core.resources/.projects/jsp500/org.eclipse.wst.jsdt.core/state.dat

	.metadata/.plugins/org.eclipse.core.resources/.projects/news2/org.eclipse.jdt.core/state.dat

	.metadata/.plugins/org.eclipse.core.resources/.projects/news2/org.eclipse.wst.jsdt.core/state.dat

	.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps
	.metadata/.plugins/org.eclipse.jdt.core/nonChainingJarsCache
	.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt
	.metadata/.plugins/org.eclipse.wst.jsdt.core/externalLibsTimeStamps