lenhome
Merge remote-tracking branch 'origin/master'

Conflicts:
	.metadata/.log
	.metadata/.plugins/org.eclipse.core.resources/.projects/Bauman/.markers

	.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/asd/org.eclipse.jdt.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/e_065_carPark/.indexes/e4/57/17/d4/b9/history.index

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

	.metadata/.plugins/org.eclipse.core.resources/.projects/e_0_composite_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/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/.root/.indexes/properties.index

	.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	.metadata/.plugins/org.eclipse.jdt.core/3355987419.index
	.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt
	.metadata/.plugins/org.eclipse.pde.core/.cache/clean-cache.properties