Changes BL, GUI, DB, usw.
Add Image


Signed-off-by: = <natalie@judosch.ch>
fixed some bugs

Signed-off-by: = <natalie@judosch.ch>
Merge branch 'master' of https://github.com/V1del/ohsom

Conflicts:
	Ohsom/src/gui/ShopGUI.java


Signed-off-by: = <natalie@judosch.ch>