New Image Conversion Tool Disabled
Conflicts:
	Webshop/src/pl/com/itsense/ecommerce/webshopadminsite/view/WorkspaceView.java