123
Merge branch 'master' of
https://github.com/gitveloper/north-american-octo-sansa.git

Conflicts:
	RFID/src/bezahlsystem/BezahlGUI.java
up