fix
Merge remote-tracking branch 'origin/master'

Conflicts:
	nfcbeta/src/main/java/de/Beta/nfc_beta/InterfaceUI.java
fix