fixed #1
fixed #1
nastroyku zakonchil, pristupayu koderit
zakonchil dobavleniye i udalenite tovara
fixed #1
fixed #1
est oshibki, ya ih ispravlu
fixed #1
fixed #1
16 ticket
16 tiket
fixed #1
fixed #1
Merge remote-tracking branch 'origin/Imanalli'

Conflicts:
	JavaFXApplication/src/main/java/javafxapplication/Controller/MainController.java
	JavaFXApplication/src/main/java/javafxapplication/Model/SoldProducts.java
	JavaFXApplication/src/main/resources/View/MainWindow.fxml
	server/src/main/java/hello/Application.java
	server/src/main/java/hello/Controller/SoldProductsController.java
	server/src/main/java/hello/Model/Seller.java
	server/src/main/java/hello/Model/Shop.java
	server/src/main/java/hello/Model/SoldProductsRepository.java
Merge remote-tracking branch 'origin/Azamat'

Conflicts:
	JavaFXApplication/src/main/java/javafxapplication/Model/Product.java
	JavaFXApplication/src/main/java/javafxapplication/Proxy/ProductProxy.java
	JavaFXApplication/src/main/resources/View/MainWindow.fxml
	server/src/main/java/hello/Model/ProductRepository.java
Merge wıth Azamat branch