Conflict resolution.
Conflicts:

	OnlineShopEclipse/WebContent/WEB-INF/jsp/ProductDetailsBody.jsp
All links on welcome page handled.