HTML til create item
Merge branch 'master' of https://github.com/Borimino/WebTekWebShop.git

Conflicts:
	.metadata/.log
	.metadata/.mylyn/.tasks.xml.zip
	.metadata/.mylyn/tasks.xml.zip
	.metadata/.plugins/org.eclipse.core.resources/.projects/Java til webshop/.markers.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/Java til webshop/.syncinfo.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/RemoteSystemsTempFiles/.markers.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/RemoteSystemsTempFiles/.syncinfo.snap
	.metadata/.plugins/org.eclipse.core.resources/.root/.markers.snap
	.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	.metadata/.plugins/org.eclipse.core.resources/.snap
	.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
Merge branch 'master' of https://github.com/Borimino/WebTekWebShop.git

Conflicts:
	TomcatServer/WebContent/WEB-INF/web.xml