some commit
Merge branch 'master' of https://github.com/xakepa/StoreManagement

Conflicts:
	MelonStoreApp/MelonStoreApp/MainWindow.xaml
	MelonStoreApp/MelonStoreApp/ViewModels/MainViewModel.cs
	MelonStoreApp/MelonStoreApp/Views/Warehouse.xaml
Merge branch 'master' of https://github.com/xakepa/StoreManagement.git
vms added