Commit
Merge remote-tracking branch 'origin/master'

Conflicts:

	Projects/MyCompany.ProductsAndWarehouse(Client)/src/mycompany/productsandwarehouse/client/MyCompanyProductsAndWarehouseClient.java