rfid + 100 fixes
Merge branch 'master' of https://github.com/veidekke/awe13

Conflicts:
	AmI - Uebung 04/MoonServer.java