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/Exceptions/.markers

	.metadata/.plugins/org.eclipse.core.resources/.projects/FirstJspServletJsp/.markers

	.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/ResultTestWebProject/org.eclipse.jdt.core/state.dat

	.metadata/.plugins/org.eclipse.core.resources/.projects/ResultTestWebProject/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/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/epamParsers/.indexes/5b/47/history.index

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

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

	.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	.metadata/.plugins/org.eclipse.debug.ui/launchConfigurationHistory.xml
	.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps
	.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt
	.metadata/.plugins/org.eclipse.jst.jsp.core/taglibindex/3149084191.dat
	.metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml

	.metadata/.plugins/org.eclipse.wst.jsdt.core/indexes/savedIndexNames.txt
	.metadata/.plugins/org.eclipse.wst.server.core/publish/publish1.dat

	.metadata/.plugins/org.eclipse.wst.server.core/tmp1/work/Catalina/localhost/WebProject/org/apache/jsp/jsp/parserout_jsp.java
	.metadata/.plugins/org.eclipse.wst.validation/dep.index
	epamParsers/logs/testLog.txt