nope
nope
Merge remote-tracking branch 'origin/master'

Conflicts:
	Projects/MyCompany.ProductsAndWarehouse(Client)/languages.Languages.log
	Projects/MyCompany.ProductsAndWarehouse(Client)/menu.MainWindow.log

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