Everything merged for final iteration!!!!
TODO: add savings info and populate database with media for testing
Finally merged everything without more issues. Bug found when adding
product to list, does not create slideshow

Merge branch 'master' of
https://github.com/SmartTrolley/SmartTrolleyMainCode.git

Conflicts:
	SmartTrolley/src/smarttrolleygui/AllShoppingListsScreenController.java
	SmartTrolley/src/smarttrolleygui/fxml/ExampleShoppingList.fxml
	SmartTrolley/src/smarttrolleygui/fxml/FavouritesScreen.fxml
	SmartTrolley/src/smarttrolleygui/fxml/HomeScreen.fxml
	SmartTrolley/src/smarttrolleygui/fxml/OffersScreen.fxml
	SmartTrolley/src/smarttrolleygui/fxml/ProductScreen.fxml
	SmartTrolley/src/tests/CreateListTest.java