highlights view
Merge branch 'master' of https://github.com/xakepa/StoreManagement

Conflicts:
	MelonStoreApp/MelonStoreApp/MainWindow.xaml
	MelonStoreApp/MelonStoreApp/MelonStoreApp.csproj
	MelonStoreApp/MelonStoreApp/Views/Home.xaml
Merge branch 'master' of https://github.com/xakepa/StoreManagement
highlights
Merge branch 'master' of https://github.com/xakepa/StoreManagement.git