LogIn GUI
LogIn GUI
login gui
merge
Merge branch 'master' of https://github.com/ChristofTorres/eShop.git

Conflicts:
	EinAuslagerung.log
	src/shop/local/ui/gui/components/JAccountButton.java
	src/shop/local/ui/gui/components/JWarenkorbButton.java