martin changes
Merge branch 'master' of github:manueljelinek/RFID-LAN-Reader

Conflicts:
	LANReader/src/at/LANReader/LANReader.java