Mensa
Merge
Merge
Merge branch 'master' of https://github.com/ChristofTorres/eShop.git

Conflicts:
	SHOP_A.ser
	src/shop/local/ui/gui/kundengui/table/ArtikelTableCellRenderer.java
	src/shop/local/ui/gui/kundengui/table/ArtikelTableModel.java
	src/shop/local/ui/gui/mitarbeitergui/MitarbeiterGUI.java